From 6a998514be4d8a1eb2252870946ace1b7c354586 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 14 May 2014 16:40:05 +0200
Subject: upgrade rails to 3.2.18 for security fixes
---
Gemfile | 2 +-
Gemfile.lock | 62 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Gemfile b/Gemfile
index b8b4568..816cc4a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem "rails", "~> 3.2.11"
+gem "rails", "~> 3.2.18"
gem "couchrest", "~> 1.1.3"
gem "couchrest_model", "~> 2.0.0"
gem "couchrest_session_store", "~> 0.2.4"
diff --git a/Gemfile.lock b/Gemfile.lock
index c7d10db..67c04de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,12 +20,12 @@ GEM
remote: https://rubygems.org/
specs:
SyslogLogger (2.0)
- actionmailer (3.2.16)
- actionpack (= 3.2.16)
+ actionmailer (3.2.18)
+ actionpack (= 3.2.18)
mail (~> 2.5.4)
- actionpack (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ actionpack (3.2.18)
+ activemodel (= 3.2.18)
+ activesupport (= 3.2.18)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -33,18 +33,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.16)
- activesupport (= 3.2.16)
+ activemodel (3.2.18)
+ activesupport (= 3.2.18)
builder (~> 3.0.0)
- activerecord (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ activerecord (3.2.18)
+ activemodel (= 3.2.18)
+ activesupport (= 3.2.18)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
- activesupport (3.2.16)
+ activeresource (3.2.18)
+ activemodel (= 3.2.18)
+ activesupport (= 3.2.18)
+ activesupport (3.2.18)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
@@ -143,7 +143,7 @@ GEM
minitest-stub-const (0.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.8.2)
+ multi_json (1.10.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
phantomjs-binaries (1.9.2.3)
@@ -153,7 +153,7 @@ GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- polyglot (0.3.3)
+ polyglot (0.3.4)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
rack (1.4.5)
@@ -161,31 +161,31 @@ GEM
rack (>= 0.4)
rack-protection (1.5.1)
rack
- rack-ssl (1.3.3)
+ rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.16)
- actionmailer (= 3.2.16)
- actionpack (= 3.2.16)
- activerecord (= 3.2.16)
- activeresource (= 3.2.16)
- activesupport (= 3.2.16)
+ rails (3.2.18)
+ actionmailer (= 3.2.18)
+ actionpack (= 3.2.18)
+ activerecord (= 3.2.18)
+ activeresource (= 3.2.18)
+ activesupport (= 3.2.18)
bundler (~> 1.0)
- railties (= 3.2.16)
+ railties (= 3.2.18)
rails-i18n (3.0.0)
i18n (~> 0.5)
rails (>= 3.0.0, < 4.0.0)
rails_warden (0.5.7)
warden (>= 1.0.0)
- railties (3.2.16)
- actionpack (= 3.2.16)
- activesupport (= 3.2.16)
+ railties (3.2.18)
+ actionpack (= 3.2.18)
+ activesupport (= 3.2.18)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.1.1)
+ rake (10.3.1)
rdiscount (2.0.7)
rdoc (3.12.2)
json (~> 1.4)
@@ -217,12 +217,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
- thor (0.18.1)
+ thor (0.19.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.38)
+ tzinfo (0.3.39)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
@@ -265,7 +265,7 @@ DEPENDENCIES
phantomjs-binaries
poltergeist
quiet_assets
- rails (~> 3.2.11)
+ rails (~> 3.2.18)
rails-i18n
rails_warden
rdiscount
--
cgit v1.2.3