diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-29 08:09:32 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-29 08:09:32 +0000 |
| commit | 39f74e92f0785eb3da2001d93682b8d1aadd35d5 (patch) | |
| tree | c31e10fa38b7375cd0dc1271fd53bbb36c3140bf | |
| parent | 4a15f9345f4e511d2743a62b6165a9604f6b1438 (diff) | |
| parent | cfe244c66c2744d3b7cfcf17cd87098334a9b737 (diff) | |
Merge branch 'hotfix/0.6.9.2' into develop
Conflicts:
Gemfile.lock
| -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", :branch => "2-3-stable" do +git "git://github.com/mysociety/rails.git", :tag => "v2.3.16.1" do gem 'rails' end gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 422424ffc..c346a318c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,24 +1,24 @@ GIT remote: git://github.com/mysociety/rails.git - revision: 541c061c13337b8235a1dcc2357b962f88868ff9 - branch: 2-3-stable + revision: be86a2fd6264637a22e1a1aeb8a8ec979f53ec1e + tag: v2.3.16.1 specs: - actionmailer (2.3.15) - actionpack (= 2.3.15) - actionpack (2.3.15) - activesupport (= 2.3.15) - rack (~> 1.1.3) - activerecord (2.3.15) - activesupport (= 2.3.15) - activeresource (2.3.15) - activesupport (= 2.3.15) - activesupport (2.3.15) - rails (2.3.15) - actionmailer (= 2.3.15) - actionpack (= 2.3.15) - activerecord (= 2.3.15) - activeresource (= 2.3.15) - activesupport (= 2.3.15) + actionmailer (2.3.16) + actionpack (= 2.3.16) + actionpack (2.3.16) + activesupport (= 2.3.16) + rack (~> 1.1.0) + activerecord (2.3.16) + activesupport (= 2.3.16) + activeresource (2.3.16) + activesupport (= 2.3.16) + activesupport (2.3.16) + rails (2.3.16) + actionmailer (= 2.3.16) + actionpack (= 2.3.16) + activerecord (= 2.3.16) + activeresource (= 2.3.16) + activesupport (= 2.3.16) rake (>= 0.8.3) GEM diff --git a/config/environment.rb b/config/environment.rb index d1189c43f..d580a1096 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.15' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') |