Download as
Browse Code »

Commit c52561211a3a34ff816973a9ccd86479d44aead8

Authored by Arthur Neves
1 parent 9c721ce9
Exists in master and in 1 other branch production

Update to rails 4.1

Showing 2 changed files with 42 additions and 37 deletions   Show diff stats
Gemfile
  Diff comments   View file @c525612
1 1 source 'https://rubygems.org'
2 2  
3   -RAILS_VERSION = '~> 4.0.12'
  3 +RAILS_VERSION = '~> 4.1.8'
4 4  
5 5 gem 'actionmailer', RAILS_VERSION
6 6 gem 'actionpack', RAILS_VERSION
... ...
Gemfile.lock
  Diff comments   View file @c525612
... ... @@ -15,39 +15,41 @@ GIT
15 15 GEM
16 16 remote: https://rubygems.org/
17 17 specs:
18   - actionmailer (4.0.12)
19   - actionpack (= 4.0.12)
  18 + actionmailer (4.1.8)
  19 + actionpack (= 4.1.8)
  20 + actionview (= 4.1.8)
20 21 mail (~> 2.5, >= 2.5.4)
21 22 actionmailer_inline_css (1.5.3)
22 23 actionmailer (>= 3.0.0)
23 24 nokogiri (>= 1.4.4)
24 25 premailer (>= 1.7.1)
25   - actionpack (4.0.12)
26   - activesupport (= 4.0.12)
27   - builder (~> 3.1.0)
28   - erubis (~> 2.7.0)
  26 + actionpack (4.1.8)
  27 + actionview (= 4.1.8)
  28 + activesupport (= 4.1.8)
29 29 rack (~> 1.5.2)
30 30 rack-test (~> 0.6.2)
31   - activemodel (4.0.12)
32   - activesupport (= 4.0.12)
33   - builder (~> 3.1.0)
34   - activerecord (4.0.12)
35   - activemodel (= 4.0.12)
36   - activerecord-deprecated_finders (~> 1.0.2)
37   - activesupport (= 4.0.12)
38   - arel (~> 4.0.0)
39   - activerecord-deprecated_finders (1.0.3)
40   - activesupport (4.0.12)
  31 + actionview (4.1.8)
  32 + activesupport (= 4.1.8)
  33 + builder (~> 3.1)
  34 + erubis (~> 2.7.0)
  35 + activemodel (4.1.8)
  36 + activesupport (= 4.1.8)
  37 + builder (~> 3.1)
  38 + activerecord (4.1.8)
  39 + activemodel (= 4.1.8)
  40 + activesupport (= 4.1.8)
  41 + arel (~> 5.0.0)
  42 + activesupport (4.1.8)
41 43 i18n (~> 0.6, >= 0.6.9)
42   - minitest (~> 4.2)
43   - multi_json (~> 1.3)
  44 + json (~> 1.7, >= 1.7.7)
  45 + minitest (~> 5.1)
44 46 thread_safe (~> 0.1)
45   - tzinfo (~> 0.3.37)
  47 + tzinfo (~> 1.1)
46 48 addressable (2.3.5)
47 49 airbrake (3.1.14)
48 50 builder
49 51 json
50   - arel (4.0.2)
  52 + arel (5.0.1.20140414130214)
51 53 bcrypt-ruby (3.1.2)
52 54 better_errors (1.0.1)
53 55 coderay (>= 1.0.0)
... ... @@ -55,7 +57,7 @@ GEM
55 57 binding_of_caller (0.7.2)
56 58 debug_inspector (>= 0.0.1)
57 59 bson (2.3.0)
58   - builder (3.1.4)
  60 + builder (3.2.2)
59 61 callsite (0.0.11)
60 62 campy (1.0.0)
61 63 capistrano (2.15.5)
... ... @@ -136,7 +138,7 @@ GEM
136 138 json (~> 1.8)
137 139 multi_xml (>= 0.5.2)
138 140 httpauth (0.2.0)
139   - i18n (0.6.11)
  141 + i18n (0.7.0)
140 142 jquery-rails (2.1.4)
141 143 railties (>= 3.0, < 5.0)
142 144 thor (>= 0.14, < 2.0)
... ... @@ -158,7 +160,7 @@ GEM
158 160 method_source (0.8.2)
159 161 mime-types (1.25.1)
160 162 mini_portile (0.6.1)
161   - minitest (4.7.5)
  163 + minitest (5.5.0)
162 164 mongoid (4.0.0)
163 165 activemodel (~> 4.0)
164 166 moped (~> 2.0.0)
... ... @@ -237,19 +239,21 @@ GEM
237 239 rack-ssl-enforcer (0.2.6)
238 240 rack-test (0.6.2)
239 241 rack (>= 1.0)
240   - rails (4.0.12)
241   - actionmailer (= 4.0.12)
242   - actionpack (= 4.0.12)
243   - activerecord (= 4.0.12)
244   - activesupport (= 4.0.12)
  242 + rails (4.1.8)
  243 + actionmailer (= 4.1.8)
  244 + actionpack (= 4.1.8)
  245 + actionview (= 4.1.8)
  246 + activemodel (= 4.1.8)
  247 + activerecord (= 4.1.8)
  248 + activesupport (= 4.1.8)
245 249 bundler (>= 1.3.0, < 2.0)
246   - railties (= 4.0.12)
  250 + railties (= 4.1.8)
247 251 sprockets-rails (~> 2.0)
248 252 rails_autolink (1.1.6)
249 253 rails (> 3.1)
250   - railties (4.0.12)
251   - actionpack (= 4.0.12)
252   - activesupport (= 4.0.12)
  254 + railties (4.1.8)
  255 + actionpack (= 4.1.8)
  256 + activesupport (= 4.1.8)
253 257 rake (>= 0.8.7)
254 258 thor (>= 0.18.1, < 2.0)
255 259 raindrops (0.12.0)
... ... @@ -310,7 +314,8 @@ GEM
310 314 tilt (1.4.1)
311 315 timecop (0.6.3)
312 316 tins (0.12.0)
313   - tzinfo (0.3.42)
  317 + tzinfo (1.2.2)
  318 + thread_safe (~> 0.1)
314 319 uglifier (2.2.1)
315 320 execjs (>= 0.3.0)
316 321 json (>= 1.8.0)
... ... @@ -332,9 +337,9 @@ PLATFORMS
332 337 ruby
333 338  
334 339 DEPENDENCIES
335   - actionmailer (~> 4.0.12)
  340 + actionmailer (~> 4.1.8)
336 341 actionmailer_inline_css
337   - actionpack (~> 4.0.12)
  342 + actionpack (~> 4.1.8)
338 343 airbrake
339 344 better_errors
340 345 binding_of_caller
... ... @@ -376,7 +381,7 @@ DEPENDENCIES
376 381 rack-ssl
377 382 rack-ssl-enforcer
378 383 rails_autolink
379   - railties (~> 4.0.12)
  384 + railties (~> 4.1.8)
380 385 ri_cal
381 386 rspec-rails
382 387 rushover
... ...