Commit ca1d77e65c8108014e9dd18da2995f0b8d71736a

Authored by Arthur Neves
1 parent 471a2872
Exists in master and in 1 other branch production

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
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 ruby (ENV['RUBY_VERSION'] || '2.0.0') unless ENV['CI'] 2 ruby (ENV['RUBY_VERSION'] || '2.0.0') unless ENV['CI']
3 3
4 -RAILS_VERSION = '~> 3.2.14' 4 +RAILS_VERSION = '~> 3.2.15'
5 5
6 gem 'actionmailer', RAILS_VERSION 6 gem 'actionmailer', RAILS_VERSION
7 gem 'actionpack', RAILS_VERSION 7 gem 'actionpack', RAILS_VERSION
@@ -147,7 +147,7 @@ GEM @@ -147,7 +147,7 @@ GEM
147 jquery-rails (2.1.4) 147 jquery-rails (2.1.4)
148 railties (>= 3.0, < 5.0) 148 railties (>= 3.0, < 5.0)
149 thor (>= 0.14, < 2.0) 149 thor (>= 0.14, < 2.0)
150 - json (1.8.0) 150 + json (1.8.1)
151 jwt (0.1.8) 151 jwt (0.1.8)
152 multi_json (>= 1.5) 152 multi_json (>= 1.5)
153 kaminari (0.14.1) 153 kaminari (0.14.1)
@@ -379,9 +379,9 @@ PLATFORMS @@ -379,9 +379,9 @@ PLATFORMS
379 ruby 379 ruby
380 380
381 DEPENDENCIES 381 DEPENDENCIES
382 - actionmailer (~> 3.2.14) 382 + actionmailer (~> 3.2.15)
383 actionmailer_inline_css 383 actionmailer_inline_css
384 - actionpack (~> 3.2.14) 384 + actionpack (~> 3.2.15)
385 airbrake 385 airbrake
386 better_errors 386 better_errors
387 binding_of_caller 387 binding_of_caller
@@ -426,7 +426,7 @@ DEPENDENCIES @@ -426,7 +426,7 @@ DEPENDENCIES
426 rack-ssl 426 rack-ssl
427 rack-ssl-enforcer 427 rack-ssl-enforcer
428 rails_autolink 428 rails_autolink
429 - railties (~> 3.2.14) 429 + railties (~> 3.2.15)
430 ri_cal 430 ri_cal
431 rspec-rails 431 rspec-rails
432 ruby-debug 432 ruby-debug