Skip to content

Commit aeb478d

Browse files
DanielKehoeDanielKehoe
committed
Rails 4.2
1 parent 62582bf commit aeb478d

14 files changed

+290
-158
lines changed

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.3
1+
2.2.0

‎Gemfile

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
source 'https://rubygems.org'
2-
ruby '2.1.3'
3-
gem 'rails', '4.2.0.beta2'
4-
gem 'sqlite3'
5-
gem 'sass-rails', '~> 5.0.0.beta1'
2+
ruby '2.2.0'
3+
gem 'rails', '4.2.0'
4+
gem 'sass-rails', '~> 5.0'
65
gem 'uglifier', '>= 1.3.0'
7-
gem 'coffee-rails', '~> 4.0.0'
8-
gem 'jquery-rails', '~> 4.0.0.beta2'
6+
gem 'coffee-rails', '~> 4.1.0'
7+
gem 'jquery-rails'
98
gem 'turbolinks'
109
gem 'jbuilder', '~> 2.0'
11-
gem 'sdoc', '~> 0.4.0', group: :doc
1210
group :development, :test do
1311
gem 'byebug'
14-
gem 'web-console', '~> 2.0.0.beta4'
12+
gem 'web-console', '~> 2.0'
1513
gem 'spring'
1614
end
1715
gem 'bootstrap-sass'
@@ -21,14 +19,19 @@ gem 'simple_form'
2119
gem 'sucker_punch'
2220
group :development do
2321
gem 'better_errors'
24-
gem 'binding_of_caller', :platforms=>[:mri_21]
2522
gem 'quiet_assets'
2623
gem 'rails_layout'
24+
gem 'spring-commands-rspec'
2725
end
2826
group :development, :test do
2927
gem 'factory_girl_rails'
3028
gem 'faker'
3129
gem 'rspec-rails'
30+
gem 'sqlite3'
31+
end
32+
group :production do
33+
gem 'pg'
34+
gem 'rails_12factor'
3235
end
3336
group :test do
3437
gem 'capybara'

‎Gemfile.lock

+101-94
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.0.beta2)
5-
actionpack (= 4.2.0.beta2)
6-
actionview (= 4.2.0.beta2)
7-
activejob (= 4.2.0.beta2)
4+
actionmailer (4.2.0)
5+
actionpack (= 4.2.0)
6+
actionview (= 4.2.0)
7+
activejob (= 4.2.0)
88
mail (~> 2.5, >= 2.5.4)
9-
rails-dom-testing (~> 1.0, >= 1.0.3)
10-
actionpack (4.2.0.beta2)
11-
actionview (= 4.2.0.beta2)
12-
activesupport (= 4.2.0.beta2)
13-
rack (~> 1.6.0.beta)
9+
rails-dom-testing (~> 1.0, >= 1.0.5)
10+
actionpack (4.2.0)
11+
actionview (= 4.2.0)
12+
activesupport (= 4.2.0)
13+
rack (~> 1.6.0)
1414
rack-test (~> 0.6.2)
15-
rails-dom-testing (~> 1.0, >= 1.0.3)
15+
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.1)
17-
actionview (4.2.0.beta2)
18-
activesupport (= 4.2.0.beta2)
17+
actionview (4.2.0)
18+
activesupport (= 4.2.0)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
21-
rails-dom-testing (~> 1.0, >= 1.0.3)
21+
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.1)
23-
activejob (4.2.0.beta2)
24-
activesupport (= 4.2.0.beta2)
23+
activejob (4.2.0)
24+
activesupport (= 4.2.0)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.0.beta2)
27-
activesupport (= 4.2.0.beta2)
26+
activemodel (4.2.0)
27+
activesupport (= 4.2.0)
2828
builder (~> 3.1)
29-
activerecord (4.2.0.beta2)
30-
activemodel (= 4.2.0.beta2)
31-
activesupport (= 4.2.0.beta2)
32-
arel (>= 6.0.0.beta1, < 6.1)
33-
activesupport (4.2.0.beta2)
34-
i18n (>= 0.7.0.beta1, < 0.8)
29+
activerecord (4.2.0)
30+
activemodel (= 4.2.0)
31+
activesupport (= 4.2.0)
32+
arel (~> 6.0)
33+
activesupport (4.2.0)
34+
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
37-
thread_safe (~> 0.1)
37+
thread_safe (~> 0.3, >= 0.3.4)
3838
tzinfo (~> 1.1)
3939
addressable (2.3.6)
40-
arel (6.0.0.beta1)
41-
better_errors (2.0.0)
40+
arel (6.0.0)
41+
better_errors (2.1.0)
4242
coderay (>= 1.0.0)
4343
erubis (>= 2.6.6)
4444
rack (>= 0.9.0)
45-
binding_of_caller (0.7.3.pre1)
45+
binding_of_caller (0.7.2)
4646
debug_inspector (>= 0.0.1)
47-
bootstrap-sass (3.2.0.2)
47+
bootstrap-sass (3.3.1.0)
4848
sass (~> 3.2)
4949
builder (3.2.2)
5050
byebug (3.5.1)
@@ -57,19 +57,19 @@ GEM
5757
rack (>= 1.0.0)
5858
rack-test (>= 0.5.4)
5959
xpath (~> 2.0)
60-
celluloid (0.15.2)
61-
timers (~> 1.1.0)
60+
celluloid (0.16.0)
61+
timers (~> 4.0.0)
6262
childprocess (0.5.5)
6363
ffi (~> 1.0, >= 1.0.11)
6464
coderay (1.1.0)
65-
coffee-rails (4.0.1)
65+
coffee-rails (4.1.0)
6666
coffee-script (>= 2.2.0)
6767
railties (>= 4.0.0, < 5.0)
6868
coffee-script (2.3.0)
6969
coffee-script-source
7070
execjs
7171
coffee-script-source (1.8.0)
72-
columnize (0.8.9)
72+
columnize (0.9.0)
7373
database_cleaner (1.3.0)
7474
debug_inspector (0.0.2)
7575
debugger-linecache (1.2.0)
@@ -84,71 +84,76 @@ GEM
8484
faker (1.4.3)
8585
i18n (~> 0.5)
8686
ffi (1.9.6)
87-
gibbon (1.1.3)
87+
gibbon (1.1.4)
8888
httparty
8989
multi_json (>= 1.3.4)
9090
globalid (0.3.0)
9191
activesupport (>= 4.1.0)
9292
high_voltage (2.2.1)
9393
hike (1.2.3)
94-
httparty (0.13.1)
94+
hitimes (1.2.2)
95+
httparty (0.13.3)
9596
json (~> 1.8)
9697
multi_xml (>= 0.5.2)
97-
i18n (0.7.0.beta1)
98-
jbuilder (2.2.4)
98+
i18n (0.7.0)
99+
jbuilder (2.2.6)
99100
activesupport (>= 3.0.0, < 5)
100101
multi_json (~> 1.2)
101-
jquery-rails (4.0.0.beta2)
102+
jquery-rails (4.0.3)
102103
rails-dom-testing (~> 1.0)
103-
railties (>= 4.2.0.beta, < 5.0)
104+
railties (>= 4.2.0)
104105
thor (>= 0.14, < 2.0)
105106
json (1.8.1)
106-
launchy (2.4.2)
107+
launchy (2.4.3)
107108
addressable (~> 2.3)
108109
loofah (2.0.1)
109110
nokogiri (>= 1.5.9)
110-
mail (2.6.1)
111+
mail (2.6.3)
111112
mime-types (>= 1.16, < 3)
112113
mime-types (2.4.3)
113-
mini_portile (0.6.0)
114-
minitest (5.4.2)
114+
mini_portile (0.6.2)
115+
minitest (5.5.0)
115116
multi_json (1.10.1)
116117
multi_xml (0.5.5)
117-
nokogiri (1.6.3.1)
118-
mini_portile (= 0.6.0)
119-
quiet_assets (1.0.3)
118+
nokogiri (1.6.5)
119+
mini_portile (~> 0.6.0)
120+
pg (0.17.1)
121+
quiet_assets (1.1.0)
120122
railties (>= 3.1, < 5.0)
121-
rack (1.6.0.beta)
123+
rack (1.6.0)
122124
rack-test (0.6.2)
123125
rack (>= 1.0)
124-
rails (4.2.0.beta2)
125-
actionmailer (= 4.2.0.beta2)
126-
actionpack (= 4.2.0.beta2)
127-
actionview (= 4.2.0.beta2)
128-
activejob (= 4.2.0.beta2)
129-
activemodel (= 4.2.0.beta2)
130-
activerecord (= 4.2.0.beta2)
131-
activesupport (= 4.2.0.beta2)
126+
rails (4.2.0)
127+
actionmailer (= 4.2.0)
128+
actionpack (= 4.2.0)
129+
actionview (= 4.2.0)
130+
activejob (= 4.2.0)
131+
activemodel (= 4.2.0)
132+
activerecord (= 4.2.0)
133+
activesupport (= 4.2.0)
132134
bundler (>= 1.3.0, < 2.0)
133-
railties (= 4.2.0.beta2)
134-
sprockets-rails (~> 3.0.0.beta1)
135+
railties (= 4.2.0)
136+
sprockets-rails
135137
rails-deprecated_sanitizer (1.0.3)
136138
activesupport (>= 4.2.0.alpha)
137-
rails-dom-testing (1.0.4)
139+
rails-dom-testing (1.0.5)
138140
activesupport (>= 4.2.0.beta, < 5.0)
139141
nokogiri (~> 1.6.0)
140142
rails-deprecated_sanitizer (>= 1.0.1)
141143
rails-html-sanitizer (1.0.1)
142144
loofah (~> 2.0)
143-
rails_layout (1.0.23)
144-
railties (4.2.0.beta2)
145-
actionpack (= 4.2.0.beta2)
146-
activesupport (= 4.2.0.beta2)
145+
rails_12factor (0.0.3)
146+
rails_serve_static_assets
147+
rails_stdout_logging
148+
rails_layout (1.0.24)
149+
rails_serve_static_assets (0.0.3)
150+
rails_stdout_logging (0.0.3)
151+
railties (4.2.0)
152+
actionpack (= 4.2.0)
153+
activesupport (= 4.2.0)
147154
rake (>= 0.8.7)
148155
thor (>= 0.18.1, < 2.0)
149-
rake (10.3.2)
150-
rdoc (4.1.2)
151-
json (~> 1.4)
156+
rake (10.4.2)
152157
rspec-core (3.1.7)
153158
rspec-support (~> 3.1.0)
154159
rspec-expectations (3.1.2)
@@ -166,51 +171,52 @@ GEM
166171
rspec-support (~> 3.1.0)
167172
rspec-support (3.1.2)
168173
rubyzip (1.1.6)
169-
sass (3.4.6)
170-
sass-rails (5.0.0.beta1)
174+
sass (3.4.9)
175+
sass-rails (5.0.1)
171176
railties (>= 4.0.0, < 5.0)
172-
sass (~> 3.2)
173-
sprockets (~> 2.12)
177+
sass (~> 3.1)
178+
sprockets (>= 2.8, < 4.0)
174179
sprockets-rails (>= 2.0, < 4.0)
175-
sdoc (0.4.1)
176-
json (~> 1.7, >= 1.7.7)
177-
rdoc (~> 4.0)
178-
selenium-webdriver (2.43.0)
180+
tilt (~> 1.1)
181+
selenium-webdriver (2.44.0)
179182
childprocess (~> 0.5)
180183
multi_json (~> 1.0)
181184
rubyzip (~> 1.0)
182185
websocket (~> 1.0)
183-
simple_form (3.0.2)
186+
simple_form (3.1.0)
184187
actionpack (~> 4.0)
185188
activemodel (~> 4.0)
186189
slop (3.6.0)
187-
spring (1.1.3)
188-
sprockets (2.12.2)
190+
spring (1.2.0)
191+
spring-commands-rspec (1.0.4)
192+
spring (>= 0.9.1)
193+
sprockets (2.12.3)
189194
hike (~> 1.2)
190195
multi_json (~> 1.0)
191196
rack (~> 1.0)
192197
tilt (~> 1.1, != 1.3.0)
193-
sprockets-rails (3.0.0.beta1)
194-
actionpack (>= 4.0)
195-
activesupport (>= 4.0)
196-
sprockets (~> 2.8)
197-
sqlite3 (1.3.9)
198-
sucker_punch (1.2.1)
199-
celluloid (~> 0.15.2)
198+
sprockets-rails (2.2.2)
199+
actionpack (>= 3.0)
200+
activesupport (>= 3.0)
201+
sprockets (>= 2.8, < 4.0)
202+
sqlite3 (1.3.10)
203+
sucker_punch (1.3.2)
204+
celluloid (~> 0.16.0)
200205
thor (0.19.1)
201206
thread_safe (0.3.4)
202207
tilt (1.4.1)
203-
timers (1.1.0)
204-
turbolinks (2.5.1)
208+
timers (4.0.1)
209+
hitimes
210+
turbolinks (2.5.3)
205211
coffee-rails
206212
tzinfo (1.2.2)
207213
thread_safe (~> 0.1)
208-
uglifier (2.5.3)
214+
uglifier (2.6.0)
209215
execjs (>= 0.3.0)
210216
json (>= 1.8.0)
211-
web-console (2.0.0.beta4)
217+
web-console (2.0.0)
212218
activemodel (~> 4.0)
213-
binding_of_caller (= 0.7.3.pre1)
219+
binding_of_caller (>= 0.7.2)
214220
railties (~> 4.0)
215221
sprockets-rails (>= 2.0, < 4.0)
216222
websocket (1.2.1)
@@ -222,30 +228,31 @@ PLATFORMS
222228

223229
DEPENDENCIES
224230
better_errors
225-
binding_of_caller
226231
bootstrap-sass
227232
byebug
228233
capybara
229-
coffee-rails (~> 4.0.0)
234+
coffee-rails (~> 4.1.0)
230235
database_cleaner
231236
factory_girl_rails
232237
faker
233238
gibbon
234239
high_voltage
235240
jbuilder (~> 2.0)
236-
jquery-rails (~> 4.0.0.beta2)
241+
jquery-rails
237242
launchy
243+
pg
238244
quiet_assets
239-
rails (= 4.2.0.beta2)
245+
rails (= 4.2.0)
246+
rails_12factor
240247
rails_layout
241248
rspec-rails
242-
sass-rails (~> 5.0.0.beta1)
243-
sdoc (~> 0.4.0)
249+
sass-rails (~> 5.0)
244250
selenium-webdriver
245251
simple_form
246252
spring
253+
spring-commands-rspec
247254
sqlite3
248255
sucker_punch
249256
turbolinks
250257
uglifier (>= 1.3.0)
251-
web-console (~> 2.0.0.beta4)
258+
web-console (~> 2.0)

0 commit comments

Comments
 (0)