| Bump gems to fix CVE-2014-4920 - warvox - VoIP based wardialing tool, forked fr… | |
| Log | |
| Files | |
| Refs | |
| README | |
| --- | |
| commit 1224e0eb02f834f56b3e9ad90d47d03ab1255e76 | |
| parent bf885015803f94afbdf0a7a710cb00d24c667077 | |
| Author: HD Moore <[email protected]> | |
| Date: Wed, 10 Sep 2014 10:56:58 -0500 | |
| Bump gems to fix CVE-2014-4920 | |
| Diffstat: | |
| M Gemfile | 2 +- | |
| M Gemfile.lock | 16 +++++++++++----- | |
| 2 files changed, 12 insertions(+), 6 deletions(-) | |
| --- | |
| diff --git a/Gemfile b/Gemfile | |
| @@ -26,7 +26,7 @@ end | |
| gem 'authlogic' | |
| gem 'rails-settings-cached' | |
| -gem 'twitter-bootstrap-rails' | |
| +gem "twitter-bootstrap-rails", :git => 'https://github.com/seyhunak/twitter-bo… | |
| gem 'formtastic' | |
| gem 'formtastic-bootstrap' | |
| gem 'rails_bootstrap_navbar' | |
| diff --git a/Gemfile.lock b/Gemfile.lock | |
| @@ -14,6 +14,16 @@ GIT | |
| activerecord (>= 3.0) | |
| activesupport (>= 3.0.0) | |
| +GIT | |
| + remote: https://github.com/seyhunak/twitter-bootstrap-rails.git | |
| + revision: 6ae6c669402ec3d85ced21cf8ce4c7c4b8a985c1 | |
| + specs: | |
| + twitter-bootstrap-rails (3.2.0) | |
| + actionpack (>= 3.1) | |
| + execjs | |
| + rails (>= 3.1) | |
| + railties (>= 3.1) | |
| + | |
| GEM | |
| remote: http://rubygems.org/ | |
| specs: | |
| @@ -214,10 +224,6 @@ GEM | |
| polyglot (>= 0.3.1) | |
| polyglot (>= 0.3.1) | |
| polyglot (>= 0.3.1) | |
| - twitter-bootstrap-rails (2.2.6) | |
| - actionpack (>= 3.1) | |
| - execjs | |
| - railties (>= 3.1) | |
| tzinfo (0.3.41) | |
| uglifier (2.0.1) | |
| execjs (>= 0.3.0) | |
| @@ -251,7 +257,7 @@ DEPENDENCIES | |
| scrypt | |
| therubyracer | |
| thin | |
| - twitter-bootstrap-rails | |
| + twitter-bootstrap-rails! | |
| uglifier (>= 1.0.3) | |
| will_paginate (~> 3.0) | |
| will_paginate-bootstrap |