Commit ca1d77e65c8108014e9dd18da2995f0b8d71736a
1 parent
471a2872
Exists in
master
and in
1 other branch
Bump RAILS_VERSION on Gemfile
Also update some rails dependencies on .lock file
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
Gemfile
Gemfile.lock
| ... | ... | @@ -147,7 +147,7 @@ GEM |
| 147 | 147 | jquery-rails (2.1.4) |
| 148 | 148 | railties (>= 3.0, < 5.0) |
| 149 | 149 | thor (>= 0.14, < 2.0) |
| 150 | - json (1.8.0) | |
| 150 | + json (1.8.1) | |
| 151 | 151 | jwt (0.1.8) |
| 152 | 152 | multi_json (>= 1.5) |
| 153 | 153 | kaminari (0.14.1) |
| ... | ... | @@ -379,9 +379,9 @@ PLATFORMS |
| 379 | 379 | ruby |
| 380 | 380 | |
| 381 | 381 | DEPENDENCIES |
| 382 | - actionmailer (~> 3.2.14) | |
| 382 | + actionmailer (~> 3.2.15) | |
| 383 | 383 | actionmailer_inline_css |
| 384 | - actionpack (~> 3.2.14) | |
| 384 | + actionpack (~> 3.2.15) | |
| 385 | 385 | airbrake |
| 386 | 386 | better_errors |
| 387 | 387 | binding_of_caller |
| ... | ... | @@ -426,7 +426,7 @@ DEPENDENCIES |
| 426 | 426 | rack-ssl |
| 427 | 427 | rack-ssl-enforcer |
| 428 | 428 | rails_autolink |
| 429 | - railties (~> 3.2.14) | |
| 429 | + railties (~> 3.2.15) | |
| 430 | 430 | ri_cal |
| 431 | 431 | rspec-rails |
| 432 | 432 | ruby-debug | ... | ... |