diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/environment.rb | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -8,7 +8,7 @@ end source :rubygems # A fork of rails that is kept up to date with security patches -git "git://github.com/mysociety/rails.git", :tag => "v2.3.16.1" do +git "git://github.com/mysociety/rails.git", :tag => "v2.3.17.1" do gem 'rails' end gem 'pg' @@ -17,7 +17,7 @@ gem 'fast_gettext', '>= 0.6.0' gem 'fastercsv', '>=1.5.5' gem 'gettext_i18n_rails', '>= 0.7.1' gem 'gettext', '~> 2.3.3' -gem 'json', '~> 1.5.1' +gem 'json', '~> 1.5.5' gem 'mahoro' gem 'mail', :platforms => :ruby_19 gem 'memcache-client', :require => 'memcache' diff --git a/Gemfile.lock b/Gemfile.lock index c346a318c..435614f9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM hoe (3.0.8) rake (~> 0.8) i18n (0.6.1) - json (1.5.4) + json (1.5.5) linecache (0.46) rbx-require-relative (> 0.0.4) linecache19 (0.5.12) @@ -162,7 +162,7 @@ DEPENDENCIES fastercsv (>= 1.5.5) gettext (~> 2.3.3) gettext_i18n_rails (>= 0.7.1) - json (~> 1.5.1) + json (~> 1.5.5) locale (>= 2.0.5) mahoro mail diff --git a/config/environment.rb b/config/environment.rb index d580a1096..44ebcba6b 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -18,7 +18,7 @@ end # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.17' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |