| Bumped gems to Rails4 - warvox - VoIP based wardialing tool, forked from rapid7… | |
| Log | |
| Files | |
| Refs | |
| README | |
| --- | |
| commit 25e448ab19c068784e530075610291f9b55c2bed | |
| parent 9b9f807286c6d19d3689561607e0923a7a4f0c07 | |
| Author: HD Moore <[email protected]> | |
| Date: Sat, 6 Sep 2014 14:26:34 -0500 | |
| Bumped gems to Rails4 | |
| Diffstat: | |
| M Gemfile | 31 ++++++++++++++---------------… | |
| M Gemfile.lock | 285 +++++++++++++----------------… | |
| 2 files changed, 132 insertions(+), 184 deletions(-) | |
| --- | |
| diff --git a/Gemfile b/Gemfile | |
| @@ -2,11 +2,11 @@ source 'http://rubygems.org' | |
| ruby '1.9.3' | |
| gem 'thin' | |
| -gem 'rails', '>=3.2.19' | |
| -gem 'pg', '>=0.11' | |
| +gem 'rails', '>=4.1.5', '< 5.0.0' | |
| +gem 'pg', '>=0.17' | |
| -gem 'jquery-rails' | |
| -gem 'jquery-datatables-rails' | |
| +gem 'jquery-rails', '>= 3.1.2' | |
| +gem 'jquery-datatables-rails', '>= 2.2.3' | |
| # Integer array support (until Rails 4.0 is released) | |
| # Git version required to work around this bug: https://github.com/dockyard/po… | |
| @@ -15,21 +15,18 @@ gem 'postgres_ext', :git => 'git://github.com/dockyard/post… | |
| gem 'kissfft' | |
| gem 'rex', '~> 2.0.0' | |
| -# Gems used only for assets and not required | |
| -# in production environments by default. | |
| -group :assets do | |
| - gem 'sass-rails', '~> 3.2.3' | |
| - gem 'coffee-rails', '~> 3.2.1' | |
| - gem 'uglifier', '>= 1.0.3' | |
| -end | |
| +gem 'sass-rails', '~> 4.0.2' | |
| +gem 'coffee-rails', '~> 4.0.1' | |
| +gem 'uglifier', '>= 1.0.3' | |
| +gem 'protected_attributes', '~> 1.0.7' | |
| -gem 'authlogic' | |
| -gem 'rails-settings-cached' | |
| +gem 'authlogic', '>= 3.4.0' | |
| +gem 'rails-settings-cached', '>= 0.4.1' | |
| gem 'twitter-bootstrap-rails' | |
| -gem 'formtastic' | |
| -gem 'formtastic-bootstrap' | |
| -gem 'rails_bootstrap_navbar' | |
| +gem 'formtastic', '>= 3.0.0' | |
| +gem 'formtastic-bootstrap', '>= 3.0.0' | |
| +gem 'rails_bootstrap_navbar', '>= 2.0.1' | |
| gem 'less-rails-bootstrap' | |
| gem 'therubyracer' | |
| @@ -37,6 +34,6 @@ gem 'reportable', :git => 'git://github.com/hmoore-r7/reporta… | |
| gem 'will_paginate', '~> 3.0' | |
| gem 'will_paginate-bootstrap' | |
| -gem 'dynamic_form' | |
| +gem 'dynamic_form', '>= 1.1.4' | |
| gem 'psych_shield' | |
| gem 'scrypt' | |
| diff --git a/Gemfile.lock b/Gemfile.lock | |
| @@ -1,10 +1,11 @@ | |
| GIT | |
| remote: git://github.com/dockyard/postgres_ext.git | |
| - revision: b1cc1ab75b86e8ff9ee77500d1de1640c417ea80 | |
| + revision: 57bded66d1faba2c9e3090bcae43f795ac208b16 | |
| specs: | |
| - postgres_ext (0.3.0) | |
| - activerecord (~> 3.2.0) | |
| - pg_array_parser (~> 0.0.8) | |
| + postgres_ext (2.3.0) | |
| + activerecord (>= 4.0.0) | |
| + arel (>= 4.0.1) | |
| + pg_array_parser (~> 0.0.9) | |
| GIT | |
| remote: git://github.com/hmoore-r7/reportable.git | |
| @@ -17,237 +18,187 @@ GIT | |
| GEM | |
| remote: http://rubygems.org/ | |
| specs: | |
| - actionmailer (3.2.19) | |
| - actionpack (= 3.2.19) | |
| + actionmailer (4.1.5) | |
| + actionpack (= 4.1.5) | |
| + actionview (= 4.1.5) | |
| mail (~> 2.5.4) | |
| - actionpack (3.2.19) | |
| - activemodel (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| - builder (~> 3.0.0) | |
| + actionpack (4.1.5) | |
| + actionview (= 4.1.5) | |
| + activesupport (= 4.1.5) | |
| + rack (~> 1.5.2) | |
| + rack-test (~> 0.6.2) | |
| + actionview (4.1.5) | |
| + activesupport (= 4.1.5) | |
| + builder (~> 3.1) | |
| erubis (~> 2.7.0) | |
| - journey (~> 1.0.4) | |
| - rack (~> 1.4.5) | |
| - rack-cache (~> 1.2) | |
| - rack-test (~> 0.6.1) | |
| - sprockets (~> 2.2.1) | |
| - activemodel (3.2.19) | |
| - activesupport (= 3.2.19) | |
| - builder (~> 3.0.0) | |
| - activerecord (3.2.19) | |
| - activemodel (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| - arel (~> 3.0.2) | |
| - tzinfo (~> 0.3.29) | |
| - activeresource (3.2.19) | |
| - activemodel (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| - activesupport (3.2.19) | |
| - i18n (~> 0.6, >= 0.6.4) | |
| - multi_json (~> 1.0) | |
| - arel (3.0.3) | |
| + activemodel (4.1.5) | |
| + activesupport (= 4.1.5) | |
| + builder (~> 3.1) | |
| + activerecord (4.1.5) | |
| + activemodel (= 4.1.5) | |
| + activesupport (= 4.1.5) | |
| + arel (~> 5.0.0) | |
| + activesupport (4.1.5) | |
| + i18n (~> 0.6, >= 0.6.9) | |
| + json (~> 1.7, >= 1.7.7) | |
| + minitest (~> 5.1) | |
| + thread_safe (~> 0.1) | |
| + tzinfo (~> 1.1) | |
| + arel (5.0.1.20140414130214) | |
| authlogic (3.4.2) | |
| activerecord (>= 3.2) | |
| activesupport (>= 3.2) | |
| request_store (~> 1.0) | |
| - builder (3.0.4) | |
| - coffee-rails (3.2.2) | |
| + bootstrap-navbar (2.2.0) | |
| + gem_config (~> 0.3) | |
| + builder (3.2.2) | |
| + coffee-rails (4.0.1) | |
| coffee-script (>= 2.2.0) | |
| - railties (~> 3.2.0) | |
| - coffee-script (2.2.0) | |
| + railties (>= 4.0.0, < 5.0) | |
| + coffee-script (2.3.0) | |
| coffee-script-source | |
| execjs | |
| - coffee-script-source (1.6.2) | |
| - commonjs (0.2.6) | |
| + coffee-script-source (1.8.0) | |
| + commonjs (0.2.7) | |
| daemons (1.1.9) | |
| dynamic_form (1.1.4) | |
| erubis (2.7.0) | |
| eventmachine (1.0.3) | |
| - execjs (1.4.0) | |
| - multi_json (~> 1.0) | |
| + execjs (2.2.1) | |
| ffi (1.9.3) | |
| ffi-compiler (0.1.3) | |
| ffi (>= 1.0.0) | |
| rake | |
| - formtastic (2.2.1) | |
| - actionpack (>= 3.0) | |
| - formtastic-bootstrap (2.0.0) | |
| - formtastic (~> 2.2) | |
| - formtastic-bootstrap | |
| + formtastic (3.0.0) | |
| + actionpack (>= 3.2.13) | |
| + formtastic-bootstrap (3.0.0) | |
| + formtastic (>= 2.2) | |
| + gem_config (0.3.1) | |
| hike (1.2.3) | |
| i18n (0.6.11) | |
| - journey (1.0.4) | |
| - jquery-datatables-rails (1.11.2) | |
| + jquery-datatables-rails (2.2.3) | |
| jquery-rails | |
| - jquery-rails (2.2.1) | |
| + sass-rails | |
| + jquery-rails (3.1.2) | |
| railties (>= 3.0, < 5.0) | |
| thor (>= 0.14, < 2.0) | |
| json (1.8.1) | |
| - kissfft (0.0.1) | |
| - less (2.3.1) | |
| - commonjs (~> 0.2.6) | |
| - less-rails (2.3.2) | |
| + kissfft (0.0.2) | |
| + less (2.5.1) | |
| + commonjs (~> 0.2.7) | |
| + less-rails (2.5.0) | |
| actionpack (>= 3.1) | |
| - less (~> 2.3.1) | |
| - less-rails-bootstrap (2.3.2) | |
| - less-rails (~> 2.3.1) | |
| - libv8 (3.11.8.17) | |
| + less (~> 2.5.0) | |
| + less-rails-bootstrap (3.2.0) | |
| + less-rails (~> 2.5.0) | |
| + libv8 (3.16.14.3) | |
| mail (2.5.4) | |
| mime-types (~> 1.16) | |
| treetop (~> 1.4.8) | |
| mime-types (1.25.1) | |
| + minitest (5.4.1) | |
| multi_json (1.10.1) | |
| pg (0.17.1) | |
| - pg_array_parser (0.0.8) | |
| + pg_array_parser (0.0.9) | |
| polyglot (0.3.5) | |
| + protected_attributes (1.0.8) | |
| + activemodel (>= 4.0.1, < 5.0) | |
| psych_shield (0.0.4) | |
| - rack (1.4.5) | |
| - rack-cache (1.2) | |
| - rack (>= 0.4) | |
| - rack-ssl (1.3.4) | |
| - rack | |
| + rack (1.5.2) | |
| 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) | |
| - bundler (~> 1.0) | |
| - railties (= 3.2.19) | |
| - rails-settings-cached (0.2.4) | |
| - rails (>= 3.0.0) | |
| - rails_bootstrap_navbar (0.1.5.beta) | |
| + rails (4.1.5) | |
| + actionmailer (= 4.1.5) | |
| + actionpack (= 4.1.5) | |
| + actionview (= 4.1.5) | |
| + activemodel (= 4.1.5) | |
| + activerecord (= 4.1.5) | |
| + activesupport (= 4.1.5) | |
| + bundler (>= 1.3.0, < 2.0) | |
| + railties (= 4.1.5) | |
| + sprockets-rails (~> 2.0) | |
| + rails-settings-cached (0.4.1) | |
| + rails (>= 4.0.0) | |
| + rails_bootstrap_navbar (2.0.1) | |
| + bootstrap-navbar (~> 2.0) | |
| rails (>= 3.0.0) | |
| - railties (3.2.19) | |
| - actionpack (= 3.2.19) | |
| - activesupport (= 3.2.19) | |
| - rack-ssl (~> 1.3.2) | |
| + railties (4.1.5) | |
| + actionpack (= 4.1.5) | |
| + activesupport (= 4.1.5) | |
| rake (>= 0.8.7) | |
| - rdoc (~> 3.4) | |
| - thor (>= 0.14.6, < 2.0) | |
| + thor (>= 0.18.1, < 2.0) | |
| rake (10.3.2) | |
| - rdoc (3.12.2) | |
| - json (~> 1.4) | |
| - ref (1.0.4) | |
| + ref (1.0.5) | |
| request_store (1.1.0) | |
| rex (2.0.0) | |
| - sass (3.2.7) | |
| - sass-rails (3.2.6) | |
| - railties (~> 3.2.0) | |
| - sass (>= 3.1.10) | |
| - tilt (~> 1.3) | |
| + sass (3.2.19) | |
| + sass-rails (4.0.3) | |
| + railties (>= 4.0.0, < 5.0) | |
| + sass (~> 3.2.0) | |
| + sprockets (~> 2.8, <= 2.11.0) | |
| + sprockets-rails (~> 2.0) | |
| scrypt (1.2.1) | |
| ffi-compiler (>= 0.0.2) | |
| rake | |
| - sprockets (2.2.2) | |
| + sprockets (2.11.0) | |
| hike (~> 1.2) | |
| multi_json (~> 1.0) | |
| rack (~> 1.0) | |
| tilt (~> 1.1, != 1.3.0) | |
| - therubyracer (0.11.4) | |
| - libv8 (~> 3.11.8.12) | |
| + sprockets-rails (2.1.4) | |
| + actionpack (>= 3.0) | |
| + activesupport (>= 3.0) | |
| + sprockets (~> 2.8) | |
| + therubyracer (0.12.1) | |
| + libv8 (~> 3.16.14.0) | |
| ref | |
| - thin (1.5.1) | |
| + thin (1.6.2) | |
| daemons (>= 1.0.9) | |
| - eventmachine (>= 0.12.6) | |
| + eventmachine (>= 1.0.0) | |
| rack (>= 1.0.0) | |
| thor (0.19.1) | |
| + thread_safe (0.3.4) | |
| 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) | |
| - twitter-bootstrap-rails (2.2.6) | |
| - actionpack (>= 3.1) | |
| - execjs | |
| - railties (>= 3.1) | |
| - tzinfo (0.3.41) | |
| - uglifier (2.0.1) | |
| + twitter-bootstrap-rails (3.2.0) | |
| + actionpack (~> 4.1) | |
| + execjs (~> 2.2) | |
| + rails (~> 4.1) | |
| + railties (~> 4.1) | |
| + tzinfo (1.2.2) | |
| + thread_safe (~> 0.1) | |
| + uglifier (2.5.3) | |
| execjs (>= 0.3.0) | |
| - multi_json (~> 1.0, >= 1.0.2) | |
| + json (>= 1.8.0) | |
| will_paginate (3.0.7) | |
| - will_paginate-bootstrap (0.2.2) | |
| + will_paginate-bootstrap (1.0.1) | |
| will_paginate (>= 3.0.3) | |
| PLATFORMS | |
| ruby | |
| DEPENDENCIES | |
| - authlogic | |
| - coffee-rails (~> 3.2.1) | |
| - dynamic_form | |
| - formtastic | |
| - formtastic-bootstrap | |
| - jquery-datatables-rails | |
| - jquery-rails | |
| + authlogic (>= 3.4.0) | |
| + coffee-rails (~> 4.0.1) | |
| + dynamic_form (>= 1.1.4) | |
| + formtastic (>= 3.0.0) | |
| + formtastic-bootstrap (>= 3.0.0) | |
| + jquery-datatables-rails (>= 2.2.3) | |
| + jquery-rails (>= 3.1.2) | |
| kissfft | |
| less-rails-bootstrap | |
| - pg (>= 0.11) | |
| + pg (>= 0.17) | |
| postgres_ext! | |
| + protected_attributes (~> 1.0.7) | |
| psych_shield | |
| - rails (>= 3.2.19) | |
| - rails-settings-cached | |
| - rails_bootstrap_navbar | |
| + rails (>= 4.1.5, < 5.0.0) | |
| + rails-settings-cached (>= 0.4.1) | |
| + rails_bootstrap_navbar (>= 2.0.1) | |
| reportable! | |
| rex (~> 2.0.0) | |
| - sass-rails (~> 3.2.3) | |
| + sass-rails (~> 4.0.2) | |
| scrypt | |
| therubyracer | |
| thin |