Fix CVE-2014-7818 - warvox - Unnamed repository; edit this file 'description' t… | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit 2077a27b56e14cbd9c7a1bbc1f3845c1529639f7 | |
parent 1224e0eb02f834f56b3e9ad90d47d03ab1255e76 | |
Author: HD Moore <[email protected]> | |
Date: Fri, 31 Oct 2014 08:55:57 -0500 | |
Fix CVE-2014-7818 | |
Diffstat: | |
M Gemfile | 2 +- | |
M Gemfile.lock | 111 ++++++++---------------------… | |
2 files changed, 28 insertions(+), 85 deletions(-) | |
--- | |
diff --git a/Gemfile b/Gemfile | |
@@ -2,7 +2,7 @@ source 'http://rubygems.org' | |
ruby '1.9.3' | |
gem 'thin' | |
-gem 'rails', '>=3.2.19' | |
+gem 'rails', '>=3.2.20', '<4.0' | |
gem 'pg', '>=0.11' | |
gem 'jquery-rails' | |
diff --git a/Gemfile.lock b/Gemfile.lock | |
@@ -27,12 +27,12 @@ GIT | |
GEM | |
remote: http://rubygems.org/ | |
specs: | |
- actionmailer (3.2.19) | |
- actionpack (= 3.2.19) | |
+ actionmailer (3.2.20) | |
+ actionpack (= 3.2.20) | |
mail (~> 2.5.4) | |
- actionpack (3.2.19) | |
- activemodel (= 3.2.19) | |
- activesupport (= 3.2.19) | |
+ actionpack (3.2.20) | |
+ activemodel (= 3.2.20) | |
+ activesupport (= 3.2.20) | |
builder (~> 3.0.0) | |
erubis (~> 2.7.0) | |
journey (~> 1.0.4) | |
@@ -40,18 +40,18 @@ GEM | |
rack-cache (~> 1.2) | |
rack-test (~> 0.6.1) | |
sprockets (~> 2.2.1) | |
- activemodel (3.2.19) | |
- activesupport (= 3.2.19) | |
+ activemodel (3.2.20) | |
+ activesupport (= 3.2.20) | |
builder (~> 3.0.0) | |
- activerecord (3.2.19) | |
- activemodel (= 3.2.19) | |
- activesupport (= 3.2.19) | |
+ activerecord (3.2.20) | |
+ activemodel (= 3.2.20) | |
+ activesupport (= 3.2.20) | |
arel (~> 3.0.2) | |
tzinfo (~> 0.3.29) | |
- activeresource (3.2.19) | |
- activemodel (= 3.2.19) | |
- activesupport (= 3.2.19) | |
- activesupport (3.2.19) | |
+ activeresource (3.2.20) | |
+ activemodel (= 3.2.20) | |
+ activesupport (= 3.2.20) | |
+ activesupport (3.2.20) | |
i18n (~> 0.6, >= 0.6.4) | |
multi_json (~> 1.0) | |
arel (3.0.3) | |
@@ -117,21 +117,21 @@ GEM | |
rack | |
rack-test (0.6.2) | |
rack (>= 1.0) | |
- rails (3.2.19) | |
- actionmailer (= 3.2.19) | |
- actionpack (= 3.2.19) | |
- activerecord (= 3.2.19) | |
- activeresource (= 3.2.19) | |
- activesupport (= 3.2.19) | |
+ rails (3.2.20) | |
+ actionmailer (= 3.2.20) | |
+ actionpack (= 3.2.20) | |
+ activerecord (= 3.2.20) | |
+ activeresource (= 3.2.20) | |
+ activesupport (= 3.2.20) | |
bundler (~> 1.0) | |
- railties (= 3.2.19) | |
+ railties (= 3.2.20) | |
rails-settings-cached (0.2.4) | |
rails (>= 3.0.0) | |
rails_bootstrap_navbar (0.1.5.beta) | |
rails (>= 3.0.0) | |
- railties (3.2.19) | |
- actionpack (= 3.2.19) | |
- activesupport (= 3.2.19) | |
+ railties (3.2.20) | |
+ actionpack (= 3.2.20) | |
+ activesupport (= 3.2.20) | |
rack-ssl (~> 1.3.2) | |
rake (>= 0.8.7) | |
rdoc (~> 3.4) | |
@@ -150,7 +150,7 @@ GEM | |
scrypt (1.2.1) | |
ffi-compiler (>= 0.0.2) | |
rake | |
- sprockets (2.2.2) | |
+ sprockets (2.2.3) | |
hike (~> 1.2) | |
multi_json (~> 1.0) | |
rack (~> 1.0) | |
@@ -166,65 +166,8 @@ GEM | |
tilt (1.4.1) | |
treetop (1.4.15) | |
polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
- polyglot (>= 0.3.1) | |
polyglot (>= 0.3.1) | |
- tzinfo (0.3.41) | |
+ tzinfo (0.3.42) | |
uglifier (2.0.1) | |
execjs (>= 0.3.0) | |
multi_json (~> 1.0, >= 1.0.2) | |
@@ -248,7 +191,7 @@ DEPENDENCIES | |
pg (>= 0.11) | |
postgres_ext! | |
psych_shield | |
- rails (>= 3.2.19) | |
+ rails (>= 3.2.20, < 4.0) | |
rails-settings-cached | |
rails_bootstrap_navbar | |
reportable! |