Skip to content

Commit 5dceb84

Browse files
committed
update to Rails 4.1
1 parent bf21d96 commit 5dceb84

28 files changed

+313
-194
lines changed

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ db/*.sqlite3
2222
/tmp/*
2323

2424
# configuration file introduced in Rails 4.1
25-
/config/secrets.yml
25+
# /config/secrets.yml
2626

2727
# various artifacts
2828
**.war
@@ -32,7 +32,7 @@ db/*.sqlite3
3232
.redcar/
3333
.sass-cache
3434
/config/config.yml
35-
/config/database.yml
35+
# /config/database.yml
3636
/coverage.data
3737
/coverage/
3838
/db/*.javadb/
@@ -81,6 +81,3 @@ pickle-email-*.html
8181
# Environment files that may contain sensitive data
8282
.env
8383
.powenv
84-
85-
# Ignore application configuration
86-
/config/application.yml

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0
1+
2.1.1

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
source 'https://rubygems.org'
2-
ruby '2.1.0'
3-
gem 'rails', '4.0.3'
2+
ruby '2.1.1'
3+
gem 'rails', '4.1.0.rc1'
44
gem 'sqlite3'
5-
gem 'sass-rails', '~> 4.0.0'
5+
gem 'sass-rails', '~> 4.0.1'
66
gem 'uglifier', '>= 1.3.0'
77
gem 'coffee-rails', '~> 4.0.0'
88
gem 'jquery-rails'
99
gem 'turbolinks'
10-
gem 'jbuilder', '~> 1.2'
11-
gem 'figaro'
12-
gem 'foundation-rails', '5.0.3'
10+
gem 'jbuilder', '~> 2.0'
11+
gem 'sdoc', '~> 0.4.0', group: :doc
12+
gem 'spring', group: :development
13+
gem 'foundation-rails', '5.0.3.1'
1314
gem 'high_voltage'
14-
gem 'simple_form'
1515
group :development do
1616
gem 'better_errors'
1717
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :rbx]

Gemfile.lock

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.3)
5-
actionpack (= 4.0.3)
4+
actionmailer (4.1.0.rc1)
5+
actionpack (= 4.1.0.rc1)
6+
actionview (= 4.1.0.rc1)
67
mail (~> 2.5.4)
7-
actionpack (4.0.3)
8-
activesupport (= 4.0.3)
9-
builder (~> 3.1.0)
10-
erubis (~> 2.7.0)
8+
actionpack (4.1.0.rc1)
9+
actionview (= 4.1.0.rc1)
10+
activesupport (= 4.1.0.rc1)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
activemodel (4.0.3)
14-
activesupport (= 4.0.3)
15-
builder (~> 3.1.0)
16-
activerecord (4.0.3)
17-
activemodel (= 4.0.3)
18-
activerecord-deprecated_finders (~> 1.0.2)
19-
activesupport (= 4.0.3)
20-
arel (~> 4.0.0)
21-
activerecord-deprecated_finders (1.0.3)
22-
activesupport (4.0.3)
23-
i18n (~> 0.6, >= 0.6.4)
24-
minitest (~> 4.2)
25-
multi_json (~> 1.3)
13+
actionview (4.1.0.rc1)
14+
activesupport (= 4.1.0.rc1)
15+
builder (~> 3.1)
16+
erubis (~> 2.7.0)
17+
activemodel (4.1.0.rc1)
18+
activesupport (= 4.1.0.rc1)
19+
builder (~> 3.1)
20+
activerecord (4.1.0.rc1)
21+
activemodel (= 4.1.0.rc1)
22+
activesupport (= 4.1.0.rc1)
23+
arel (~> 5.0.0)
24+
activesupport (4.1.0.rc1)
25+
i18n (~> 0.6, >= 0.6.9)
26+
json (~> 1.7, >= 1.7.7)
27+
minitest (~> 5.1)
2628
thread_safe (~> 0.1)
27-
tzinfo (~> 0.3.37)
28-
arel (4.0.2)
29-
atomic (1.1.14)
29+
tzinfo (~> 1.1)
30+
arel (5.0.0)
31+
atomic (1.1.15)
3032
better_errors (1.1.0)
3133
coderay (>= 1.0.0)
3234
erubis (>= 2.6.6)
3335
binding_of_caller (0.7.2)
3436
debug_inspector (>= 0.0.1)
35-
builder (3.1.4)
37+
builder (3.2.2)
3638
coderay (1.1.0)
3739
coffee-rails (4.0.1)
3840
coffee-script (>= 2.2.0)
@@ -44,16 +46,13 @@ GEM
4446
debug_inspector (0.0.2)
4547
erubis (2.7.0)
4648
execjs (2.0.2)
47-
figaro (0.7.0)
48-
bundler (~> 1.0)
49-
rails (>= 3, < 5)
50-
foundation-rails (5.1.1.0)
49+
foundation-rails (5.0.3.1)
5150
railties (>= 3.1.0)
5251
sass (>= 3.2.0)
5352
high_voltage (2.1.0)
5453
hike (1.2.3)
5554
i18n (0.6.9)
56-
jbuilder (1.5.3)
55+
jbuilder (2.0.3)
5756
activesupport (>= 3.0.0)
5857
multi_json (>= 1.2.0)
5958
jquery-rails (3.1.0)
@@ -64,37 +63,45 @@ GEM
6463
mime-types (~> 1.16)
6564
treetop (~> 1.4.8)
6665
mime-types (1.25.1)
67-
minitest (4.7.5)
66+
minitest (5.3.0)
6867
multi_json (1.8.4)
6968
polyglot (0.3.4)
7069
quiet_assets (1.0.2)
7170
railties (>= 3.1, < 5.0)
7271
rack (1.5.2)
7372
rack-test (0.6.2)
7473
rack (>= 1.0)
75-
rails (4.0.3)
76-
actionmailer (= 4.0.3)
77-
actionpack (= 4.0.3)
78-
activerecord (= 4.0.3)
79-
activesupport (= 4.0.3)
74+
rails (4.1.0.rc1)
75+
actionmailer (= 4.1.0.rc1)
76+
actionpack (= 4.1.0.rc1)
77+
actionview (= 4.1.0.rc1)
78+
activemodel (= 4.1.0.rc1)
79+
activerecord (= 4.1.0.rc1)
80+
activesupport (= 4.1.0.rc1)
8081
bundler (>= 1.3.0, < 2.0)
81-
railties (= 4.0.3)
82+
railties (= 4.1.0.rc1)
8283
sprockets-rails (~> 2.0.0)
83-
rails_layout (1.0.7)
84-
railties (4.0.3)
85-
actionpack (= 4.0.3)
86-
activesupport (= 4.0.3)
84+
rails_layout (1.0.10)
85+
railties (4.1.0.rc1)
86+
actionpack (= 4.1.0.rc1)
87+
activesupport (= 4.1.0.rc1)
8788
rake (>= 0.8.7)
8889
thor (>= 0.18.1, < 2.0)
8990
rake (10.1.1)
91+
rdoc (4.1.1)
92+
json (~> 1.4)
9093
sass (3.2.14)
9194
sass-rails (4.0.1)
9295
railties (>= 4.0.0, < 5.0)
9396
sass (>= 3.1.10)
9497
sprockets-rails (~> 2.0.0)
98+
sdoc (0.4.0)
99+
json (~> 1.8)
100+
rdoc (~> 4.0, < 5.0)
95101
simple_form (3.0.1)
96102
actionpack (>= 4.0.0, < 4.1)
97103
activemodel (>= 4.0.0, < 4.1)
104+
spring (1.1.2)
98105
sprockets (2.11.0)
99106
hike (~> 1.2)
100107
multi_json (~> 1.0)
@@ -104,17 +111,18 @@ GEM
104111
actionpack (>= 3.0)
105112
activesupport (>= 3.0)
106113
sprockets (~> 2.8)
107-
sqlite3 (1.3.8)
114+
sqlite3 (1.3.9)
108115
thor (0.18.1)
109-
thread_safe (0.1.3)
110-
atomic
116+
thread_safe (0.2.0)
117+
atomic (>= 1.1.7, < 2)
111118
tilt (1.4.1)
112119
treetop (1.4.15)
113120
polyglot
114121
polyglot (>= 0.3.1)
115122
turbolinks (2.2.1)
116123
coffee-rails
117-
tzinfo (0.3.38)
124+
tzinfo (1.1.0)
125+
thread_safe (~> 0.1)
118126
uglifier (2.4.0)
119127
execjs (>= 0.3.0)
120128
json (>= 1.8.0)
@@ -126,16 +134,17 @@ DEPENDENCIES
126134
better_errors
127135
binding_of_caller
128136
coffee-rails (~> 4.0.0)
129-
figaro
130-
foundation-rails
137+
foundation-rails (= 5.0.3.1)
131138
high_voltage
132-
jbuilder (~> 1.2)
139+
jbuilder (~> 2.0)
133140
jquery-rails
134141
quiet_assets
135-
rails (= 4.0.3)
142+
rails (= 4.1.0.rc1)
136143
rails_layout
137-
sass-rails (~> 4.0.0)
144+
sass-rails (~> 4.0.1)
145+
sdoc (~> 0.4.0)
138146
simple_form
147+
spring
139148
sqlite3
140149
turbolinks
141150
uglifier (>= 1.3.0)

README

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,58 @@
1-
Rails + Foundation
1+
Rails Foundation
22
========================
33

4-
You can use this project as a starting point for a Rails web application. It requires Rails 4 and integrates Zurb Foundation.
5-
6-
Zurb Foundation
7-
http://foundation.zurb.com/
4+
This application was generated with the rails_apps_composer gem:
5+
https://github.com/RailsApps/rails_apps_composer
6+
provided by the RailsApps Project:
7+
http://railsapps.github.io/
88

99
________________________
1010

11-
For more information, please see the updated README file on GitHub:
12-
13-
https://github.com/railsapps/rails-foundation
11+
Recipes:
12+
13+
* apps4
14+
* controllers
15+
* core
16+
* email
17+
* extras
18+
* frontend
19+
* gems
20+
* git
21+
* init
22+
* models
23+
* prelaunch
24+
* railsapps
25+
* readme
26+
* routes
27+
* saas
28+
* setup
29+
* testing
30+
* views
31+
32+
Preferences:
33+
34+
* git: true
35+
* apps4: rails-foundation
36+
* database: default
37+
* unit_test: false
38+
* integration: false
39+
* fixtures: false
40+
* frontend: foundation5
41+
* email: none
42+
* authentication: false
43+
* devise_modules: false
44+
* authorization: false
45+
* starter_app: false
46+
* form_builder: simple_form
47+
* quiet_assets: true
48+
* local_env_file: false
49+
* better_errors: true
50+
* dev_webserver: webrick
51+
* prod_webserver: same
52+
* templates: erb
53+
* continuous_testing: none
54+
* rvmrc: true
1455

1556
________________________
1657

17-
MIT License
18-
19-
http://www.opensource.org/licenses/mit-license
58+
License

0 commit comments

Comments
 (0)