Upgrade Rails to 4.1.16 first - warvox - VoIP based wardialing tool, forked from rapid7/warvox.
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit f2d367546ccb8bf02ff553a14c3ed22af65af3c7
(DIR) parent 8cafcfbc5ec3fcaed8ece0e36960d59cb8e5c890
(HTM) Author: Chee Yeo <ckyeo.1@gmail.com>
Date: Thu, 18 Aug 2016 16:08:29 +0100
Upgrade Rails to 4.1.16 first
Diffstat:
M .gitignore | 2 ++
M Gemfile | 3 ++-
M Gemfile.lock | 63 ++++++++++++++++++-------------
D config/initializers/secret_token.rb | 1 -
4 files changed, 40 insertions(+), 29 deletions(-)
---
(DIR) diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ config/secrets.yml
# vagrant and ansible files
.vagrant
playbook.retry
+
+TODO.md
(DIR) diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'unicorn'
-gem 'rails', '>=4.1.9', '< 4.2.0'
+gem 'rails', '4.1.16'
gem 'pg', '>=0.17'
gem 'jquery-rails', '>= 3.1.2'
@@ -43,6 +43,7 @@ group :development do
gem 'rails_layout'
gem 'guard-livereload', '~> 2.4', require: false
gem 'annotate'
+ gem 'web-console', '~> 2.0'
end
group :development, :test do
gem 'factory_girl_rails'
(DIR) diff --git a/Gemfile.lock b/Gemfile.lock
@@ -19,27 +19,27 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.1.15)
- actionpack (= 4.1.15)
- actionview (= 4.1.15)
+ actionmailer (4.1.16)
+ actionpack (= 4.1.16)
+ actionview (= 4.1.16)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.15)
- actionview (= 4.1.15)
- activesupport (= 4.1.15)
+ actionpack (4.1.16)
+ actionview (= 4.1.16)
+ activesupport (= 4.1.16)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.15)
- activesupport (= 4.1.15)
+ actionview (4.1.16)
+ activesupport (= 4.1.16)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.15)
- activesupport (= 4.1.15)
+ activemodel (4.1.16)
+ activesupport (= 4.1.16)
builder (~> 3.1)
- activerecord (4.1.15)
- activemodel (= 4.1.15)
- activesupport (= 4.1.15)
+ activerecord (4.1.16)
+ activemodel (= 4.1.16)
+ activesupport (= 4.1.16)
arel (~> 5.0.0)
- activesupport (4.1.15)
+ activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -57,6 +57,8 @@ GEM
scrypt (>= 1.2, < 3.0)
autoprefixer-rails (6.3.6.2)
execjs
+ binding_of_caller (0.7.2)
+ debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.5)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
@@ -80,6 +82,7 @@ GEM
execjs
coffee-script-source (1.10.0)
database_cleaner (1.5.3)
+ debug_inspector (0.0.2)
diff-lcs (1.2.5)
dynamic_form (1.1.4)
em-websocket (0.5.1)
@@ -181,22 +184,22 @@ GEM
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.15)
- actionmailer (= 4.1.15)
- actionpack (= 4.1.15)
- actionview (= 4.1.15)
- activemodel (= 4.1.15)
- activerecord (= 4.1.15)
- activesupport (= 4.1.15)
+ rails (4.1.16)
+ actionmailer (= 4.1.16)
+ actionpack (= 4.1.16)
+ actionview (= 4.1.16)
+ activemodel (= 4.1.16)
+ activerecord (= 4.1.16)
+ activesupport (= 4.1.16)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.15)
+ railties (= 4.1.16)
sprockets-rails (~> 2.0)
rails-settings-cached (0.4.1)
rails (>= 4.0.0)
rails_layout (1.0.29)
- railties (4.1.15)
- actionpack (= 4.1.15)
- activesupport (= 4.1.15)
+ railties (4.1.16)
+ actionpack (= 4.1.16)
+ activesupport (= 4.1.16)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.16.0)
@@ -279,6 +282,11 @@ GEM
unicorn (5.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
+ web-console (2.3.0)
+ activemodel (>= 4.0)
+ binding_of_caller (>= 0.7.2)
+ railties (>= 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
websocket (1.2.3)
will_paginate (3.1.0)
will_paginate-bootstrap (1.0.1)
@@ -315,7 +323,7 @@ DEPENDENCIES
pg (>= 0.17)
protected_attributes (~> 1.0.7)
psych_shield
- rails (>= 4.1.9, < 4.2.0)
+ rails (= 4.1.16)
rails-settings-cached (>= 0.4.1)
rails_layout
reportable!
@@ -328,8 +336,9 @@ DEPENDENCIES
therubyracer
uglifier (>= 1.0.3)
unicorn
+ web-console (~> 2.0)
will_paginate (~> 3.0)
will_paginate-bootstrap
BUNDLED WITH
- 1.11.2
+ 1.12.5
(DIR) diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
@@ -1 +0,0 @@
-Web::Application.config.secret_token = WarVOX::Config.load_session_key