Commit c0450ad401ab10d9e59b76de197f259d6e14f4c2
Exists in
master
and in
1 other branch
Merge pull request #439 from rdlugosz/upgrade_to_rails_3-2-13
Update to Rails 3.2.13
Showing
2 changed files
with
33 additions
and
33 deletions
Show diff stats
Gemfile
Gemfile.lock
| ... | ... | @@ -9,16 +9,16 @@ GEM |
| 9 | 9 | remote: http://rubygems.org/ |
| 10 | 10 | specs: |
| 11 | 11 | SystemTimer (1.2.3) |
| 12 | - actionmailer (3.2.12) | |
| 13 | - actionpack (= 3.2.12) | |
| 14 | - mail (~> 2.4.4) | |
| 12 | + actionmailer (3.2.13) | |
| 13 | + actionpack (= 3.2.13) | |
| 14 | + mail (~> 2.5.3) | |
| 15 | 15 | actionmailer_inline_css (1.3.1) |
| 16 | 16 | actionmailer (>= 3.0.0) |
| 17 | 17 | nokogiri (>= 1.4.4) |
| 18 | 18 | premailer (>= 1.7.1) |
| 19 | - actionpack (3.2.12) | |
| 20 | - activemodel (= 3.2.12) | |
| 21 | - activesupport (= 3.2.12) | |
| 19 | + actionpack (3.2.13) | |
| 20 | + activemodel (= 3.2.13) | |
| 21 | + activesupport (= 3.2.13) | |
| 22 | 22 | builder (~> 3.0.0) |
| 23 | 23 | erubis (~> 2.7.0) |
| 24 | 24 | journey (~> 1.0.4) |
| ... | ... | @@ -26,19 +26,19 @@ GEM |
| 26 | 26 | rack-cache (~> 1.2) |
| 27 | 27 | rack-test (~> 0.6.1) |
| 28 | 28 | sprockets (~> 2.2.1) |
| 29 | - activemodel (3.2.12) | |
| 30 | - activesupport (= 3.2.12) | |
| 29 | + activemodel (3.2.13) | |
| 30 | + activesupport (= 3.2.13) | |
| 31 | 31 | builder (~> 3.0.0) |
| 32 | - activerecord (3.2.12) | |
| 33 | - activemodel (= 3.2.12) | |
| 34 | - activesupport (= 3.2.12) | |
| 32 | + activerecord (3.2.13) | |
| 33 | + activemodel (= 3.2.13) | |
| 34 | + activesupport (= 3.2.13) | |
| 35 | 35 | arel (~> 3.0.2) |
| 36 | 36 | tzinfo (~> 0.3.29) |
| 37 | - activeresource (3.2.12) | |
| 38 | - activemodel (= 3.2.12) | |
| 39 | - activesupport (= 3.2.12) | |
| 40 | - activesupport (3.2.12) | |
| 41 | - i18n (~> 0.6) | |
| 37 | + activeresource (3.2.13) | |
| 38 | + activemodel (= 3.2.13) | |
| 39 | + activesupport (= 3.2.13) | |
| 40 | + activesupport (3.2.13) | |
| 41 | + i18n (= 0.6.1) | |
| 42 | 42 | multi_json (~> 1.0) |
| 43 | 43 | addressable (2.3.2) |
| 44 | 44 | arel (3.0.2) |
| ... | ... | @@ -155,7 +155,7 @@ GEM |
| 155 | 155 | activesupport (>= 3.0.0) |
| 156 | 156 | linecache (0.46) |
| 157 | 157 | rbx-require-relative (> 0.0.4) |
| 158 | - mail (2.4.4) | |
| 158 | + mail (2.5.3) | |
| 159 | 159 | i18n (>= 0.4.0) |
| 160 | 160 | mime-types (~> 1.16) |
| 161 | 161 | treetop (~> 1.4.8) |
| ... | ... | @@ -175,7 +175,7 @@ GEM |
| 175 | 175 | bundler (>= 1.0.0) |
| 176 | 176 | rails (>= 3.0.0) |
| 177 | 177 | railties (>= 3.0.0) |
| 178 | - multi_json (1.5.1) | |
| 178 | + multi_json (1.7.0) | |
| 179 | 179 | multi_xml (0.5.2) |
| 180 | 180 | multipart-post (1.1.5) |
| 181 | 181 | net-scp (1.0.4) |
| ... | ... | @@ -239,19 +239,19 @@ GEM |
| 239 | 239 | rack-ssl-enforcer (0.2.4) |
| 240 | 240 | rack-test (0.6.2) |
| 241 | 241 | rack (>= 1.0) |
| 242 | - rails (3.2.12) | |
| 243 | - actionmailer (= 3.2.12) | |
| 244 | - actionpack (= 3.2.12) | |
| 245 | - activerecord (= 3.2.12) | |
| 246 | - activeresource (= 3.2.12) | |
| 247 | - activesupport (= 3.2.12) | |
| 242 | + rails (3.2.13) | |
| 243 | + actionmailer (= 3.2.13) | |
| 244 | + actionpack (= 3.2.13) | |
| 245 | + activerecord (= 3.2.13) | |
| 246 | + activeresource (= 3.2.13) | |
| 247 | + activesupport (= 3.2.13) | |
| 248 | 248 | bundler (~> 1.0) |
| 249 | - railties (= 3.2.12) | |
| 249 | + railties (= 3.2.13) | |
| 250 | 250 | rails_autolink (1.0.9) |
| 251 | 251 | rails (~> 3.1) |
| 252 | - railties (3.2.12) | |
| 253 | - actionpack (= 3.2.12) | |
| 254 | - activesupport (= 3.2.12) | |
| 252 | + railties (3.2.13) | |
| 253 | + actionpack (= 3.2.13) | |
| 254 | + activesupport (= 3.2.13) | |
| 255 | 255 | rack-ssl (~> 1.3.2) |
| 256 | 256 | rake (>= 0.8.7) |
| 257 | 257 | rdoc (~> 3.4) |
| ... | ... | @@ -259,7 +259,7 @@ GEM |
| 259 | 259 | raindrops (0.10.0) |
| 260 | 260 | rake (10.0.3) |
| 261 | 261 | rbx-require-relative (0.0.9) |
| 262 | - rdoc (3.12.1) | |
| 262 | + rdoc (3.12.2) | |
| 263 | 263 | json (~> 1.4) |
| 264 | 264 | ref (1.0.2) |
| 265 | 265 | responders (0.9.2) |
| ... | ... | @@ -311,7 +311,7 @@ GEM |
| 311 | 311 | eventmachine (>= 0.12.6) |
| 312 | 312 | rack (>= 1.0.0) |
| 313 | 313 | thor (0.17.0) |
| 314 | - tilt (1.3.3) | |
| 314 | + tilt (1.3.6) | |
| 315 | 315 | timecop (0.3.5) |
| 316 | 316 | treetop (1.4.12) |
| 317 | 317 | polyglot |
| ... | ... | @@ -319,7 +319,7 @@ GEM |
| 319 | 319 | turbo-sprockets-rails3 (0.3.6) |
| 320 | 320 | railties (> 3.2.8, < 4.0.0) |
| 321 | 321 | sprockets (>= 2.0.0) |
| 322 | - tzinfo (0.3.35) | |
| 322 | + tzinfo (0.3.37) | |
| 323 | 323 | uglifier (1.2.7) |
| 324 | 324 | execjs (>= 0.3.0) |
| 325 | 325 | multi_json (~> 1.3) |
| ... | ... | @@ -382,7 +382,7 @@ DEPENDENCIES |
| 382 | 382 | pry-rails |
| 383 | 383 | rack-ssl |
| 384 | 384 | rack-ssl-enforcer |
| 385 | - rails (= 3.2.12) | |
| 385 | + rails (= 3.2.13) | |
| 386 | 386 | rails_autolink (~> 1.0.9) |
| 387 | 387 | ri_cal |
| 388 | 388 | rspec-rails (~> 2.6) | ... | ... |