Skip to content

Commit 78b5a8b

Browse files
authored
Merge pull request #283 from coopdevs/upgrade-to-rails4.2.7.1
Upgrade to rails 4.2.7.1
2 parents 79e963a + 1e1a66c commit 78b5a8b

File tree

2 files changed

+80
-73
lines changed

2 files changed

+80
-73
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
ruby '2.3.0'
33

4-
gem 'rails', '4.2.5.2'
4+
gem 'rails', '~> 4.2.7.1'
55
gem 'rails-i18n'
66
gem 'rails_12factor'
77
gem "rdiscount"
@@ -58,7 +58,7 @@ group :development do
5858
end
5959

6060
group :development, :test do
61-
gem "rspec-rails", '~> 3.4.0'
61+
gem "rspec-rails", '~> 3.5.2'
6262
gem "capybara", '~> 2.4.4'
6363
gem "byebug"
6464
end

Gemfile.lock

Lines changed: 78 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,36 @@ GIT
1919
GEM
2020
remote: https://rubygems.org/
2121
specs:
22-
actionmailer (4.2.5.2)
23-
actionpack (= 4.2.5.2)
24-
actionview (= 4.2.5.2)
25-
activejob (= 4.2.5.2)
22+
actionmailer (4.2.7.1)
23+
actionpack (= 4.2.7.1)
24+
actionview (= 4.2.7.1)
25+
activejob (= 4.2.7.1)
2626
mail (~> 2.5, >= 2.5.4)
2727
rails-dom-testing (~> 1.0, >= 1.0.5)
28-
actionpack (4.2.5.2)
29-
actionview (= 4.2.5.2)
30-
activesupport (= 4.2.5.2)
28+
actionpack (4.2.7.1)
29+
actionview (= 4.2.7.1)
30+
activesupport (= 4.2.7.1)
3131
rack (~> 1.6)
3232
rack-test (~> 0.6.2)
3333
rails-dom-testing (~> 1.0, >= 1.0.5)
3434
rails-html-sanitizer (~> 1.0, >= 1.0.2)
35-
actionview (4.2.5.2)
36-
activesupport (= 4.2.5.2)
35+
actionview (4.2.7.1)
36+
activesupport (= 4.2.7.1)
3737
builder (~> 3.1)
3838
erubis (~> 2.7.0)
3939
rails-dom-testing (~> 1.0, >= 1.0.5)
4040
rails-html-sanitizer (~> 1.0, >= 1.0.2)
41-
activejob (4.2.5.2)
42-
activesupport (= 4.2.5.2)
41+
activejob (4.2.7.1)
42+
activesupport (= 4.2.7.1)
4343
globalid (>= 0.3.0)
44-
activemodel (4.2.5.2)
45-
activesupport (= 4.2.5.2)
44+
activemodel (4.2.7.1)
45+
activesupport (= 4.2.7.1)
4646
builder (~> 3.1)
47-
activerecord (4.2.5.2)
48-
activemodel (= 4.2.5.2)
49-
activesupport (= 4.2.5.2)
47+
activerecord (4.2.7.1)
48+
activemodel (= 4.2.7.1)
49+
activesupport (= 4.2.7.1)
5050
arel (~> 6.0)
51-
activesupport (4.2.5.2)
51+
activesupport (4.2.7.1)
5252
i18n (~> 0.7)
5353
json (~> 1.7, >= 1.7.7)
5454
minitest (~> 5.1)
@@ -60,7 +60,7 @@ GEM
6060
sshkit (>= 1.6.1, != 1.7.0)
6161
arbre (1.0.3)
6262
activesupport (>= 3.0.0)
63-
arel (6.0.3)
63+
arel (6.0.4)
6464
ast (2.0.0)
6565
astrolabe (1.3.0)
6666
parser (>= 2.2.0.pre.3, < 3.0)
@@ -81,7 +81,7 @@ GEM
8181
bourbon (3.2.4)
8282
sass (~> 3.2)
8383
thor
84-
builder (3.2.2)
84+
builder (3.2.3)
8585
byebug (4.0.5)
8686
columnize (= 0.9.0)
8787
capistrano (3.4.0)
@@ -110,7 +110,8 @@ GEM
110110
execjs
111111
coffee-script-source (1.8.0)
112112
columnize (0.9.0)
113-
concurrent-ruby (1.0.1)
113+
concurrent-ruby (1.0.5)
114+
crass (1.0.3)
114115
daemons (1.1.9)
115116
dalli (2.7.2)
116117
database_cleaner (1.3.0)
@@ -122,7 +123,7 @@ GEM
122123
responders
123124
thread_safe (~> 0.1)
124125
warden (~> 1.2.3)
125-
diff-lcs (1.2.5)
126+
diff-lcs (1.3)
126127
domain_name (0.5.20170223)
127128
unf (>= 0.0.5, < 1.0.0)
128129
dotenv (1.0.2)
@@ -156,8 +157,8 @@ GEM
156157
actionpack (>= 3.2.13)
157158
formtastic_i18n (0.1.1)
158159
gli (2.16.0)
159-
globalid (0.3.6)
160-
activesupport (>= 4.1.0)
160+
globalid (0.4.1)
161+
activesupport (>= 4.2.0)
161162
has_scope (0.6.0)
162163
actionpack (>= 3.2, < 5)
163164
activesupport (>= 3.2, < 5)
@@ -168,7 +169,8 @@ GEM
168169
http-cookie (1.0.3)
169170
domain_name (~> 0.5)
170171
http_accept_language (2.0.2)
171-
i18n (0.7.0)
172+
i18n (0.9.1)
173+
concurrent-ruby (~> 1.0)
172174
inherited_resources (1.6.0)
173175
actionpack (>= 3.2, < 5)
174176
has_scope (~> 0.6.0.rc)
@@ -180,7 +182,7 @@ GEM
180182
thor (>= 0.14, < 2.0)
181183
jquery-ui-rails (5.0.3)
182184
railties (>= 3.2.16)
183-
json (1.8.3)
185+
json (1.8.6)
184186
kaminari (0.16.1)
185187
actionpack (>= 3.0.0)
186188
activesupport (>= 3.0.0)
@@ -194,16 +196,18 @@ GEM
194196
i18n (~> 0.4)
195197
json
196198
rest-client
197-
loofah (2.0.3)
199+
loofah (2.1.1)
200+
crass (~> 1.0.2)
198201
nokogiri (>= 1.5.9)
199-
mail (2.6.4)
200-
mime-types (>= 1.16, < 4)
202+
mail (2.7.0)
203+
mini_mime (>= 0.1.1)
201204
memcachier (0.0.2)
202-
mime-types (3.0)
205+
mime-types (3.1)
203206
mime-types-data (~> 3.2015)
204-
mime-types-data (3.2016.0221)
207+
mime-types-data (3.2016.0521)
208+
mini_mime (1.0.0)
205209
mini_portile2 (2.0.0)
206-
minitest (5.8.4)
210+
minitest (5.11.1)
207211
multi_json (1.11.2)
208212
multipart-post (2.0.0)
209213
net-scp (1.2.1)
@@ -229,25 +233,25 @@ GEM
229233
activesupport (>= 3.0.0)
230234
quiet_assets (1.1.0)
231235
railties (>= 3.1, < 5.0)
232-
rack (1.6.4)
236+
rack (1.6.8)
233237
rack-test (0.6.3)
234238
rack (>= 1.0)
235-
rails (4.2.5.2)
236-
actionmailer (= 4.2.5.2)
237-
actionpack (= 4.2.5.2)
238-
actionview (= 4.2.5.2)
239-
activejob (= 4.2.5.2)
240-
activemodel (= 4.2.5.2)
241-
activerecord (= 4.2.5.2)
242-
activesupport (= 4.2.5.2)
239+
rails (4.2.7.1)
240+
actionmailer (= 4.2.7.1)
241+
actionpack (= 4.2.7.1)
242+
actionview (= 4.2.7.1)
243+
activejob (= 4.2.7.1)
244+
activemodel (= 4.2.7.1)
245+
activerecord (= 4.2.7.1)
246+
activesupport (= 4.2.7.1)
243247
bundler (>= 1.3.0, < 2.0)
244-
railties (= 4.2.5.2)
248+
railties (= 4.2.7.1)
245249
sprockets-rails
246250
rails-deprecated_sanitizer (1.0.3)
247251
activesupport (>= 4.2.0.alpha)
248-
rails-dom-testing (1.0.7)
249-
activesupport (>= 4.2.0.beta, < 5.0)
250-
nokogiri (~> 1.6.0)
252+
rails-dom-testing (1.0.9)
253+
activesupport (>= 4.2.0, < 5.0)
254+
nokogiri (~> 1.6)
251255
rails-deprecated_sanitizer (>= 1.0.1)
252256
rails-html-sanitizer (1.0.3)
253257
loofah (~> 2.0)
@@ -259,14 +263,14 @@ GEM
259263
rails_stdout_logging
260264
rails_serve_static_assets (0.0.3)
261265
rails_stdout_logging (0.0.3)
262-
railties (4.2.5.2)
263-
actionpack (= 4.2.5.2)
264-
activesupport (= 4.2.5.2)
266+
railties (4.2.7.1)
267+
actionpack (= 4.2.7.1)
268+
activesupport (= 4.2.7.1)
265269
rake (>= 0.8.7)
266270
thor (>= 0.18.1, < 2.0)
267271
rainbow (2.0.0)
268272
raindrops (0.16.0)
269-
rake (11.1.1)
273+
rake (12.3.0)
270274
ransack (1.6.3)
271275
actionpack (>= 3.0)
272276
activerecord (>= 3.0)
@@ -282,23 +286,23 @@ GEM
282286
netrc (~> 0.8)
283287
rollbar (2.8.3)
284288
multi_json
285-
rspec-core (3.4.1)
286-
rspec-support (~> 3.4.0)
287-
rspec-expectations (3.4.0)
289+
rspec-core (3.5.4)
290+
rspec-support (~> 3.5.0)
291+
rspec-expectations (3.5.0)
288292
diff-lcs (>= 1.2.0, < 2.0)
289-
rspec-support (~> 3.4.0)
290-
rspec-mocks (3.4.1)
293+
rspec-support (~> 3.5.0)
294+
rspec-mocks (3.5.0)
291295
diff-lcs (>= 1.2.0, < 2.0)
292-
rspec-support (~> 3.4.0)
293-
rspec-rails (3.4.0)
294-
actionpack (>= 3.0, < 4.3)
295-
activesupport (>= 3.0, < 4.3)
296-
railties (>= 3.0, < 4.3)
297-
rspec-core (~> 3.4.0)
298-
rspec-expectations (~> 3.4.0)
299-
rspec-mocks (~> 3.4.0)
300-
rspec-support (~> 3.4.0)
301-
rspec-support (3.4.1)
296+
rspec-support (~> 3.5.0)
297+
rspec-rails (3.5.2)
298+
actionpack (>= 3.0)
299+
activesupport (>= 3.0)
300+
railties (>= 3.0)
301+
rspec-core (~> 3.5.0)
302+
rspec-expectations (~> 3.5.0)
303+
rspec-mocks (~> 3.5.0)
304+
rspec-support (~> 3.5.0)
305+
rspec-support (3.5.0)
302306
rubocop (0.28.0)
303307
astrolabe (~> 1.3)
304308
parser (>= 2.2.0.pre.7, < 3.0)
@@ -324,10 +328,10 @@ GEM
324328
simple_form (3.1.0)
325329
actionpack (~> 4.0)
326330
activemodel (~> 4.0)
327-
sprockets (3.5.2)
331+
sprockets (3.7.1)
328332
concurrent-ruby (~> 1.0)
329333
rack (> 1, < 3)
330-
sprockets-rails (3.0.4)
334+
sprockets-rails (3.2.1)
331335
actionpack (>= 4.0)
332336
activesupport (>= 4.0)
333337
sprockets (>= 3.0.0)
@@ -338,13 +342,13 @@ GEM
338342
daemons (~> 1.0, >= 1.0.9)
339343
eventmachine (~> 1.0)
340344
rack (~> 1.0)
341-
thor (0.19.1)
342-
thread_safe (0.3.5)
345+
thor (0.19.4)
346+
thread_safe (0.3.6)
343347
tilt (2.0.2)
344348
travis-lint (2.0.0)
345349
json
346350
ttfunk (1.4.0)
347-
tzinfo (1.2.2)
351+
tzinfo (1.2.4)
348352
thread_safe (~> 0.1)
349353
uglifier (2.7.2)
350354
execjs (>= 0.3.0)
@@ -409,13 +413,13 @@ DEPENDENCIES
409413
prawn-table
410414
pundit
411415
quiet_assets
412-
rails (= 4.2.5.2)
416+
rails (~> 4.2.7.1)
413417
rails-i18n
414418
rails_12factor
415419
rake
416420
rdiscount
417421
rollbar (= 2.8.3)
418-
rspec-rails (~> 3.4.0)
422+
rspec-rails (~> 3.5.2)
419423
rubocop
420424
sass-rails (~> 5.0.1)
421425
select2-rails
@@ -428,5 +432,8 @@ DEPENDENCIES
428432
web-console (= 2.1.3)
429433
whenever
430434

435+
RUBY VERSION
436+
ruby 2.3.0p0
437+
431438
BUNDLED WITH
432-
1.11.2
439+
1.16.1

0 commit comments

Comments
 (0)