Download as
Browse Code »

Commit 422d583b9f3fdc325f9b06d8907976c7300c40ab

Authored by Stephen Crosby
2 parents 435b3db3 4a957962
Exists in master

Merge pull request #1071 from svenwin/master 

Rails upgrade to 4.2.5.2
Showing 2 changed files with 37 additions and 37 deletions   Show diff stats
Gemfile
  Diff comments   View file @422d583
1 1 source 'https://rubygems.org'
2 2  
3   -RAILS_VERSION = '~> 4.2.5.1'
  3 +RAILS_VERSION = '~> 4.2.5.2'
4 4  
5 5 send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']
6 6  
... ...
Gemfile.lock
  Diff comments   View file @422d583
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (4.2.5.1)
5   - actionpack (= 4.2.5.1)
6   - actionview (= 4.2.5.1)
7   - activejob (= 4.2.5.1)
  4 + actionmailer (4.2.5.2)
  5 + actionpack (= 4.2.5.2)
  6 + actionview (= 4.2.5.2)
  7 + activejob (= 4.2.5.2)
8 8 mail (~> 2.5, >= 2.5.4)
9 9 rails-dom-testing (~> 1.0, >= 1.0.5)
10 10 actionmailer_inline_css (1.5.3)
11 11 actionmailer (>= 3.0.0)
12 12 nokogiri (>= 1.4.4)
13 13 premailer (>= 1.7.1)
14   - actionpack (4.2.5.1)
15   - actionview (= 4.2.5.1)
16   - activesupport (= 4.2.5.1)
  14 + actionpack (4.2.5.2)
  15 + actionview (= 4.2.5.2)
  16 + activesupport (= 4.2.5.2)
17 17 rack (~> 1.6)
18 18 rack-test (~> 0.6.2)
19 19 rails-dom-testing (~> 1.0, >= 1.0.5)
20 20 rails-html-sanitizer (~> 1.0, >= 1.0.2)
21   - actionview (4.2.5.1)
22   - activesupport (= 4.2.5.1)
  21 + actionview (4.2.5.2)
  22 + activesupport (= 4.2.5.2)
23 23 builder (~> 3.1)
24 24 erubis (~> 2.7.0)
25 25 rails-dom-testing (~> 1.0, >= 1.0.5)
26 26 rails-html-sanitizer (~> 1.0, >= 1.0.2)
27   - activejob (4.2.5.1)
28   - activesupport (= 4.2.5.1)
  27 + activejob (4.2.5.2)
  28 + activesupport (= 4.2.5.2)
29 29 globalid (>= 0.3.0)
30   - activemodel (4.2.5.1)
31   - activesupport (= 4.2.5.1)
  30 + activemodel (4.2.5.2)
  31 + activesupport (= 4.2.5.2)
32 32 builder (~> 3.1)
33   - activerecord (4.2.5.1)
34   - activemodel (= 4.2.5.1)
35   - activesupport (= 4.2.5.1)
  33 + activerecord (4.2.5.2)
  34 + activemodel (= 4.2.5.2)
  35 + activesupport (= 4.2.5.2)
36 36 arel (~> 6.0)
37   - activesupport (4.2.5.1)
  37 + activesupport (4.2.5.2)
38 38 i18n (~> 0.7)
39 39 json (~> 1.7, >= 1.7.7)
40 40 minitest (~> 5.1)
... ... @@ -89,8 +89,8 @@ GEM
89 89 coderay (1.1.0)
90 90 colorize (0.7.7)
91 91 columnize (0.9.0)
92   - concurrent-ruby (1.0.0)
93   - concurrent-ruby (1.0.0-java)
  92 + concurrent-ruby (1.0.1)
  93 + concurrent-ruby (1.0.1-java)
94 94 coveralls (0.8.2)
95 95 json (~> 1.8)
96 96 rest-client (>= 1.6.8, < 2)
... ... @@ -184,7 +184,7 @@ GEM
184 184 rack-contrib (~> 1.1)
185 185 railties (>= 3.0.0, < 5.0.0)
186 186 method_source (0.8.2)
187   - mime-types (2.99)
  187 + mime-types (2.99.1)
188 188 mimemagic (0.3.0)
189 189 mini_portile2 (2.0.0)
190 190 minitest (5.8.4)
... ... @@ -273,16 +273,16 @@ GEM
273 273 rack-ssl-enforcer (0.2.8)
274 274 rack-test (0.6.3)
275 275 rack (>= 1.0)
276   - rails (4.2.5.1)
277   - actionmailer (= 4.2.5.1)
278   - actionpack (= 4.2.5.1)
279   - actionview (= 4.2.5.1)
280   - activejob (= 4.2.5.1)
281   - activemodel (= 4.2.5.1)
282   - activerecord (= 4.2.5.1)
283   - activesupport (= 4.2.5.1)
  276 + rails (4.2.5.2)
  277 + actionmailer (= 4.2.5.2)
  278 + actionpack (= 4.2.5.2)
  279 + actionview (= 4.2.5.2)
  280 + activejob (= 4.2.5.2)
  281 + activemodel (= 4.2.5.2)
  282 + activerecord (= 4.2.5.2)
  283 + activesupport (= 4.2.5.2)
284 284 bundler (>= 1.3.0, < 2.0)
285   - railties (= 4.2.5.1)
  285 + railties (= 4.2.5.2)
286 286 sprockets-rails
287 287 rails-deprecated_sanitizer (1.0.3)
288 288 activesupport (>= 4.2.0.alpha)
... ... @@ -299,9 +299,9 @@ GEM
299 299 rails (> 3.1)
300 300 rails_serve_static_assets (0.0.4)
301 301 rails_stdout_logging (0.0.3)
302   - railties (4.2.5.1)
303   - actionpack (= 4.2.5.1)
304   - activesupport (= 4.2.5.1)
  302 + railties (4.2.5.2)
  303 + actionpack (= 4.2.5.2)
  304 + activesupport (= 4.2.5.2)
305 305 rake (>= 0.8.7)
306 306 thor (>= 0.18.1, < 2.0)
307 307 rainbow (2.0.0)
... ... @@ -374,7 +374,7 @@ GEM
374 374 sprockets (3.5.2)
375 375 concurrent-ruby (~> 1.0)
376 376 rack (> 1, < 3)
377   - sprockets-rails (3.0.0)
  377 + sprockets-rails (3.0.3)
378 378 actionpack (>= 4.0)
379 379 activesupport (>= 4.0)
380 380 sprockets (>= 3.0.0)
... ... @@ -421,9 +421,9 @@ PLATFORMS
421 421 ruby
422 422  
423 423 DEPENDENCIES
424   - actionmailer (~> 4.2.5.1)
  424 + actionmailer (~> 4.2.5.2)
425 425 actionmailer_inline_css
426   - actionpack (~> 4.2.5.1)
  426 + actionpack (~> 4.2.5.2)
427 427 airbrake (~> 4.3.5)
428 428 better_errors
429 429 binding_of_caller
... ... @@ -470,7 +470,7 @@ DEPENDENCIES
470 470 rack-ssl-enforcer
471 471 rails_12factor
472 472 rails_autolink
473   - railties (~> 4.2.5.1)
  473 + railties (~> 4.2.5.2)
474 474 ri_cal
475 475 rspec (~> 3.3)
476 476 rspec-activemodel-mocks
... ...