From ca1d77e65c8108014e9dd18da2995f0b8d71736a Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Thu, 17 Oct 2013 23:08:02 -0400 Subject: [PATCH] Bump RAILS_VERSION on Gemfile --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 06e23a6..f153589 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby (ENV['RUBY_VERSION'] || '2.0.0') unless ENV['CI'] -RAILS_VERSION = '~> 3.2.14' +RAILS_VERSION = '~> 3.2.15' gem 'actionmailer', RAILS_VERSION gem 'actionpack', RAILS_VERSION diff --git a/Gemfile.lock b/Gemfile.lock index 6a00bf4..d244d6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,7 +147,7 @@ GEM jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.1) jwt (0.1.8) multi_json (>= 1.5) kaminari (0.14.1) @@ -379,9 +379,9 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 3.2.14) + actionmailer (~> 3.2.15) actionmailer_inline_css - actionpack (~> 3.2.14) + actionpack (~> 3.2.15) airbrake better_errors binding_of_caller @@ -426,7 +426,7 @@ DEPENDENCIES rack-ssl rack-ssl-enforcer rails_autolink - railties (~> 3.2.14) + railties (~> 3.2.15) ri_cal rspec-rails ruby-debug -- libgit2 0.21.2