Commit 5fc4a5dc97d5f8e158a184e998cdcecc85123a30
1 parent
8e5a029c
Exists in
master
and in
1 other branch
update rails to 3.2.5
Showing
1 changed file
with
27 additions
and
27 deletions
Show diff stats
Gemfile.lock
| @@ -2,35 +2,35 @@ GEM | @@ -2,35 +2,35 @@ GEM | ||
| 2 | remote: http://rubygems.org/ | 2 | remote: http://rubygems.org/ |
| 3 | specs: | 3 | specs: |
| 4 | SystemTimer (1.2.3) | 4 | SystemTimer (1.2.3) |
| 5 | - actionmailer (3.2.3) | ||
| 6 | - actionpack (= 3.2.3) | 5 | + actionmailer (3.2.5) |
| 6 | + actionpack (= 3.2.5) | ||
| 7 | mail (~> 2.4.4) | 7 | mail (~> 2.4.4) |
| 8 | actionmailer_inline_css (1.3.1) | 8 | actionmailer_inline_css (1.3.1) |
| 9 | actionmailer (>= 3.0.0) | 9 | actionmailer (>= 3.0.0) |
| 10 | nokogiri (>= 1.4.4) | 10 | nokogiri (>= 1.4.4) |
| 11 | premailer (>= 1.7.1) | 11 | premailer (>= 1.7.1) |
| 12 | - actionpack (3.2.3) | ||
| 13 | - activemodel (= 3.2.3) | ||
| 14 | - activesupport (= 3.2.3) | 12 | + actionpack (3.2.5) |
| 13 | + activemodel (= 3.2.5) | ||
| 14 | + activesupport (= 3.2.5) | ||
| 15 | builder (~> 3.0.0) | 15 | builder (~> 3.0.0) |
| 16 | erubis (~> 2.7.0) | 16 | erubis (~> 2.7.0) |
| 17 | journey (~> 1.0.1) | 17 | journey (~> 1.0.1) |
| 18 | rack (~> 1.4.0) | 18 | rack (~> 1.4.0) |
| 19 | rack-cache (~> 1.2) | 19 | rack-cache (~> 1.2) |
| 20 | rack-test (~> 0.6.1) | 20 | rack-test (~> 0.6.1) |
| 21 | - sprockets (~> 2.1.2) | ||
| 22 | - activemodel (3.2.3) | ||
| 23 | - activesupport (= 3.2.3) | 21 | + sprockets (~> 2.1.3) |
| 22 | + activemodel (3.2.5) | ||
| 23 | + activesupport (= 3.2.5) | ||
| 24 | builder (~> 3.0.0) | 24 | builder (~> 3.0.0) |
| 25 | - activerecord (3.2.3) | ||
| 26 | - activemodel (= 3.2.3) | ||
| 27 | - activesupport (= 3.2.3) | 25 | + activerecord (3.2.5) |
| 26 | + activemodel (= 3.2.5) | ||
| 27 | + activesupport (= 3.2.5) | ||
| 28 | arel (~> 3.0.2) | 28 | arel (~> 3.0.2) |
| 29 | tzinfo (~> 0.3.29) | 29 | tzinfo (~> 0.3.29) |
| 30 | - activeresource (3.2.3) | ||
| 31 | - activemodel (= 3.2.3) | ||
| 32 | - activesupport (= 3.2.3) | ||
| 33 | - activesupport (3.2.3) | 30 | + activeresource (3.2.5) |
| 31 | + activemodel (= 3.2.5) | ||
| 32 | + activesupport (= 3.2.5) | ||
| 33 | + activesupport (3.2.5) | ||
| 34 | i18n (~> 0.6) | 34 | i18n (~> 0.6) |
| 35 | multi_json (~> 1.0) | 35 | multi_json (~> 1.0) |
| 36 | addressable (2.2.8) | 36 | addressable (2.2.8) |
| @@ -174,23 +174,23 @@ GEM | @@ -174,23 +174,23 @@ GEM | ||
| 174 | rack-ssl-enforcer (0.2.4) | 174 | rack-ssl-enforcer (0.2.4) |
| 175 | rack-test (0.6.1) | 175 | rack-test (0.6.1) |
| 176 | rack (>= 1.0) | 176 | rack (>= 1.0) |
| 177 | - rails (3.2.3) | ||
| 178 | - actionmailer (= 3.2.3) | ||
| 179 | - actionpack (= 3.2.3) | ||
| 180 | - activerecord (= 3.2.3) | ||
| 181 | - activeresource (= 3.2.3) | ||
| 182 | - activesupport (= 3.2.3) | 177 | + rails (3.2.5) |
| 178 | + actionmailer (= 3.2.5) | ||
| 179 | + actionpack (= 3.2.5) | ||
| 180 | + activerecord (= 3.2.5) | ||
| 181 | + activeresource (= 3.2.5) | ||
| 182 | + activesupport (= 3.2.5) | ||
| 183 | bundler (~> 1.0) | 183 | bundler (~> 1.0) |
| 184 | - railties (= 3.2.3) | 184 | + railties (= 3.2.5) |
| 185 | rails_autolink (1.0.9) | 185 | rails_autolink (1.0.9) |
| 186 | rails (~> 3.1) | 186 | rails (~> 3.1) |
| 187 | - railties (3.2.3) | ||
| 188 | - actionpack (= 3.2.3) | ||
| 189 | - activesupport (= 3.2.3) | 187 | + railties (3.2.5) |
| 188 | + actionpack (= 3.2.5) | ||
| 189 | + activesupport (= 3.2.5) | ||
| 190 | rack-ssl (~> 1.3.2) | 190 | rack-ssl (~> 1.3.2) |
| 191 | rake (>= 0.8.7) | 191 | rake (>= 0.8.7) |
| 192 | rdoc (~> 3.4) | 192 | rdoc (~> 3.4) |
| 193 | - thor (~> 0.14.6) | 193 | + thor (>= 0.14.6, < 2.0) |
| 194 | raindrops (0.8.0) | 194 | raindrops (0.8.0) |
| 195 | rake (0.9.2.2) | 195 | rake (0.9.2.2) |
| 196 | rbx-require-relative (0.0.9) | 196 | rbx-require-relative (0.0.9) |
| @@ -238,7 +238,7 @@ GEM | @@ -238,7 +238,7 @@ GEM | ||
| 238 | daemons (>= 1.0.9) | 238 | daemons (>= 1.0.9) |
| 239 | eventmachine (>= 0.12.6) | 239 | eventmachine (>= 0.12.6) |
| 240 | rack (>= 1.0.0) | 240 | rack (>= 1.0.0) |
| 241 | - thor (0.14.6) | 241 | + thor (0.15.2) |
| 242 | tilt (1.3.3) | 242 | tilt (1.3.3) |
| 243 | treetop (1.4.10) | 243 | treetop (1.4.10) |
| 244 | polyglot | 244 | polyglot |