diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 36 | ||||
| -rw-r--r-- | config/environment.rb | 2 |
3 files changed, 20 insertions, 20 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.17.1" do +git "git://github.com/mysociety/rails.git", :tag => "v2.3.18.1" do gem 'rails' end gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 28aa68468..96544ec84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,24 +1,24 @@ GIT remote: git://github.com/mysociety/rails.git - revision: 893560c501f2c3eda044938840108431dcf6ab91 - tag: v2.3.17.1 + revision: c0d325a13e133b14d2faa01053226cd77c1378a7 + tag: v2.3.18.1 specs: - actionmailer (2.3.17) - actionpack (= 2.3.17) - actionpack (2.3.17) - activesupport (= 2.3.17) + actionmailer (2.3.18) + actionpack (= 2.3.18) + actionpack (2.3.18) + activesupport (= 2.3.18) rack (~> 1.1.0) - activerecord (2.3.17) - activesupport (= 2.3.17) - activeresource (2.3.17) - activesupport (= 2.3.17) - activesupport (2.3.17) - rails (2.3.17) - actionmailer (= 2.3.17) - actionpack (= 2.3.17) - activerecord (= 2.3.17) - activeresource (= 2.3.17) - activesupport (= 2.3.17) + activerecord (2.3.18) + activesupport (= 2.3.18) + activeresource (2.3.18) + activesupport (= 2.3.18) + activesupport (2.3.18) + rails (2.3.18) + actionmailer (= 2.3.18) + actionpack (= 2.3.18) + activerecord (= 2.3.18) + activeresource (= 2.3.18) + activesupport (= 2.3.18) rake (>= 0.8.3) GEM @@ -90,7 +90,7 @@ GEM newrelic_rpm (3.5.4.34) pg (0.13.2) polyglot (0.3.3) - rack (1.1.5) + rack (1.1.6) rake (0.9.2.2) rbx-require-relative (0.0.9) rdoc (2.4.3) diff --git a/config/environment.rb b/config/environment.rb index 7ffbe8701..9f973feb1 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.17' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |