 |
Add missing scrypt gem, upgrade things, test - warvox - VoIP based wardialing t… |
 |
Log |
|
Files |
|
Refs |
|
README |
|
--- |
|
commit cf46e5b6167ba78a1e91bb20c2c6805e65167374 |
|
parent 28e6e78f4d89889b29a9571421f5748e74785372 |
 |
Author: HD Moore <[email protected]> |
|
Date: Tue, 26 Aug 2014 11:30:35 -0500 |
|
|
|
Add missing scrypt gem, upgrade things, test |
|
|
|
Diffstat: |
|
M Gemfile | 1 + |
|
M Gemfile.lock | 8 ++++++++ |
|
A app/assets/images/favicon.ico | 0 |
|
M config/application.rb | 9 +++++---- |
|
A config/initializers/bootstrap.rb | 0 |
|
|
|
5 files changed, 14 insertions(+), 4 deletions(-) |
|
--- |
|
diff --git a/Gemfile b/Gemfile |
|
@@ -39,3 +39,4 @@ gem 'will_paginate', '~> 3.0' |
|
gem 'will_paginate-bootstrap' |
|
gem 'dynamic_form' |
|
gem 'psych_shield' |
|
+gem 'scrypt' |
|
diff --git a/Gemfile.lock b/Gemfile.lock |
|
@@ -64,6 +64,10 @@ GEM |
|
eventmachine (1.0.3) |
|
execjs (1.4.0) |
|
multi_json (~> 1.0) |
|
+ 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) |
|
@@ -133,6 +137,9 @@ GEM |
|
railties (~> 3.2.0) |
|
sass (>= 3.1.10) |
|
tilt (~> 1.3) |
|
+ scrypt (1.2.1) |
|
+ ffi-compiler (>= 0.0.2) |
|
+ rake |
|
sprockets (2.2.2) |
|
hike (~> 1.2) |
|
multi_json (~> 1.0) |
|
@@ -241,6 +248,7 @@ DEPENDENCIES |
|
rails_bootstrap_navbar |
|
reportable! |
|
sass-rails (~> 3.2.3) |
|
+ scrypt |
|
therubyracer |
|
thin |
|
twitter-bootstrap-rails |
|
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico |
|
Binary files differ. |
|
diff --git a/config/application.rb b/config/application.rb |
|
@@ -61,11 +61,12 @@ module Web |
|
|
|
# Version of your assets, change this if you want to expire all your assets |
|
config.assets.version = '1.0' |
|
+ |
|
+ # Config I8n |
|
+ I18n.enforce_available_locales = false |
|
|
|
# Configure sensitive parameters which will be filtered from the log file. |
|
- config.filter_parameters += [:password, :pass] |
|
- |
|
- config.session_store :cookie_store, :key => "_warvox" |
|
- config.secret_token = WarVOX::Config.load_session_key |
|
+ config.session_store :cookie_store, :key => "_warvox" |
|
+ config.secret_token = WarVOX::Config.load_session_key |
|
end |
|
end |
|
diff --git a/config/initializers/bootstrap.rb b/config/initializers/bootstrap.rb |
