Merge branch 'hotfix/0.7.0.5' into develop

Conflicts:
    Gemfile.lock
    locale/cy/app.po
    locale/fr/app.po
    locale/he_IL/app.po
    locale/id/app.po
    locale/pt_BR/app.po
    locale/ro_RO/app.po
    locale/sr@latin/app.po
    locale/uk/app.po

3 files changed, 19 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index b04781b5d..d5fa4ed72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ end
 source 'https://rubygems.org'
 
 # 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 c0e7532e6..23a362d08 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)
 
 GIT
diff --git a/config/environment.rb b/config/environment.rb
index f9042857b..b1cf659bb 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')