aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-12-04 08:26:22 +0000
committerLouise Crow <louise.crow@gmail.com>2013-12-04 08:26:22 +0000
commitb02aabf77d9dbe137a6c0893d42355dc89df29a2 (patch)
treee58d6d704a844b5c2351b9f2ce103fa84ea441cb
parent2eb478a4bf9d6f4cf22bbf2fb63a0e16716ec20b (diff)
Upgrade Rails to 3.2.16 to get fixes for CVE-2013-6414, CVE-2013-4491, CVE-2013-6417, CVE-2013-6415.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock56
2 files changed, 29 insertions, 29 deletions
diff --git a/Gemfile b/Gemfile
index e4b12100e..c5cd85233 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s
end
source 'https://rubygems.org'
-gem 'rails', '3.2.15'
+gem 'rails', '3.2.16'
gem 'pg'
diff --git a/Gemfile.lock b/Gemfile.lock
index 46c018352..6c0c99eeb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,12 +18,12 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.15)
- actionpack (= 3.2.15)
+ actionmailer (3.2.16)
+ actionpack (= 3.2.16)
mail (~> 2.5.4)
- actionpack (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
+ actionpack (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -31,23 +31,23 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.15)
- activesupport (= 3.2.15)
+ activemodel (3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
- activerecord (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
+ activerecord (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
- activesupport (3.2.15)
+ activeresource (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
+ activesupport (3.2.16)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
annotate (2.5.0)
rake
- arel (3.0.2)
+ arel (3.0.3)
bootstrap-sass (2.3.1.2)
sass (~> 3.2)
builder (3.0.4)
@@ -113,7 +113,7 @@ GEM
tilt
highline (1.6.19)
hike (1.2.3)
- i18n (0.6.5)
+ i18n (0.6.9)
journey (1.0.4)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
@@ -139,7 +139,7 @@ GEM
sqlite3 (~> 1.3)
thin (~> 1.5.0)
memcache-client (1.8.5)
- mime-types (1.25)
+ mime-types (1.25.1)
multi_json (1.8.2)
net-http-local (0.1.2)
net-purge (0.1.0)
@@ -166,19 +166,19 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.15)
- actionmailer (= 3.2.15)
- actionpack (= 3.2.15)
- activerecord (= 3.2.15)
- activeresource (= 3.2.15)
- activesupport (= 3.2.15)
+ rails (3.2.16)
+ actionmailer (= 3.2.16)
+ actionpack (= 3.2.16)
+ activerecord (= 3.2.16)
+ activeresource (= 3.2.16)
+ activesupport (= 3.2.16)
bundler (~> 1.0)
- railties (= 3.2.15)
+ railties (= 3.2.16)
rails-i18n (0.7.3)
i18n (~> 0.5)
- railties (3.2.15)
- actionpack (= 3.2.15)
- activesupport (= 3.2.15)
+ railties (3.2.16)
+ actionpack (= 3.2.16)
+ activesupport (= 3.2.16)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -306,7 +306,7 @@ DEPENDENCIES
nokogiri
pg
rack
- rails (= 3.2.15)
+ rails (= 3.2.16)
rails-i18n
rake (= 0.9.2.2)
rdoc