Merge branch 'cheeyeo-rails5' into rails5 - warvox - Unnamed repository; edit t… | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit c8fa56771fefb5bc3ce563bcea9f1772a3ddb33d | |
parent bb01f3689fc28527ccd0cf08065f95aeb1df9f55 | |
Author: Jay Scott <[email protected]> | |
Date: Mon, 22 Aug 2016 08:56:48 +0000 | |
Merge branch 'cheeyeo-rails5' into rails5 | |
Diffstat: | |
M Gemfile | 13 +++++++------ | |
M Gemfile.lock | 154 ++++++++++++++++-------------… | |
M app/controllers/user_sessions_cont… | 2 +- | |
M app/models/settings.rb | 2 +- | |
M app/views/application/_nav.html.erb | 4 +++- | |
M app/views/home/about.html.erb | 2 +- | |
M app/views/layouts/login.html.erb | 4 +++- | |
M config/environments/development.rb | 4 ++-- | |
M config/initializers/assets.rb | 5 ++++- | |
D config/initializers/bootstrap.rb | 0 | |
10 files changed, 100 insertions(+), 90 deletions(-) | |
--- | |
diff --git a/Gemfile b/Gemfile | |
@@ -1,10 +1,10 @@ | |
source 'https://rubygems.org' | |
gem 'unicorn' | |
-gem 'rails', '4.2.7' | |
-gem 'pg', '>=0.17' | |
+gem 'rails', '~> 4.2', '>= 4.2.7.1' | |
+gem 'pg', '~> 0.15' | |
-gem 'jquery-rails', '>= 3.1.2' | |
+gem 'jquery-rails' | |
gem 'jquery-datatables-rails', git: 'https://github.com/rweng/jquery-datatable… | |
#gem 'postgres_ext', :git => 'git://github.com/dockyard/postgres_ext.git' | |
@@ -12,9 +12,9 @@ gem 'kissfft' | |
gem 'rex', '~> 2.0.10' | |
gem 'bootstrap-sass', '>= 3.2.0' | |
-gem 'sass-rails', '~> 4.0.2' | |
-gem 'coffee-rails', '~> 4.0.1' | |
-gem 'uglifier', '>= 1.0.3' | |
+gem 'sass-rails', '~> 5.0' | |
+gem 'coffee-rails', '~> 4.1.0' | |
+gem 'uglifier', '>= 1.3.0' | |
gem 'protected_attributes', '~> 1.0.7' | |
gem 'autoprefixer-rails' | |
@@ -49,6 +49,7 @@ group :development, :test do | |
gem 'factory_girl_rails' | |
gem 'faker' | |
gem 'rspec-rails' | |
+ gem 'byebug' | |
end | |
group :test do | |
gem 'capybara' | |
diff --git a/Gemfile.lock b/Gemfile.lock | |
@@ -19,36 +19,36 @@ GIT | |
GEM | |
remote: https://rubygems.org/ | |
specs: | |
- actionmailer (4.2.7) | |
- actionpack (= 4.2.7) | |
- actionview (= 4.2.7) | |
- activejob (= 4.2.7) | |
+ actionmailer (4.2.7.1) | |
+ actionpack (= 4.2.7.1) | |
+ actionview (= 4.2.7.1) | |
+ activejob (= 4.2.7.1) | |
mail (~> 2.5, >= 2.5.4) | |
rails-dom-testing (~> 1.0, >= 1.0.5) | |
- actionpack (4.2.7) | |
- actionview (= 4.2.7) | |
- activesupport (= 4.2.7) | |
+ actionpack (4.2.7.1) | |
+ actionview (= 4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
rack (~> 1.6) | |
rack-test (~> 0.6.2) | |
rails-dom-testing (~> 1.0, >= 1.0.5) | |
rails-html-sanitizer (~> 1.0, >= 1.0.2) | |
- actionview (4.2.7) | |
- activesupport (= 4.2.7) | |
+ actionview (4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
builder (~> 3.1) | |
erubis (~> 2.7.0) | |
rails-dom-testing (~> 1.0, >= 1.0.5) | |
rails-html-sanitizer (~> 1.0, >= 1.0.2) | |
- activejob (4.2.7) | |
- activesupport (= 4.2.7) | |
+ activejob (4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
globalid (>= 0.3.0) | |
- activemodel (4.2.7) | |
- activesupport (= 4.2.7) | |
+ activemodel (4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
builder (~> 3.1) | |
- activerecord (4.2.7) | |
- activemodel (= 4.2.7) | |
- activesupport (= 4.2.7) | |
+ activerecord (4.2.7.1) | |
+ activemodel (= 4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
arel (~> 6.0) | |
- activesupport (4.2.7) | |
+ activesupport (4.2.7.1) | |
i18n (~> 0.7) | |
json (~> 1.7, >= 1.7.7) | |
minitest (~> 5.1) | |
@@ -64,16 +64,17 @@ GEM | |
activesupport (>= 3.2) | |
request_store (~> 1.0) | |
scrypt (>= 1.2, < 3.0) | |
- autoprefixer-rails (6.3.6.2) | |
+ autoprefixer-rails (6.4.0.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) | |
- breadcrumbs_on_rails (2.3.1) | |
+ bootstrap-sass (3.3.7) | |
+ autoprefixer-rails (>= 5.2.1) | |
+ sass (>= 3.3.4) | |
+ breadcrumbs_on_rails (3.0.0) | |
builder (3.2.2) | |
- capybara (2.7.1) | |
+ byebug (9.0.5) | |
+ capybara (2.8.0) | |
addressable | |
mime-types (>= 1.16) | |
nokogiri (>= 1.3.3) | |
@@ -83,13 +84,14 @@ GEM | |
childprocess (0.5.9) | |
ffi (~> 1.0, >= 1.0.11) | |
coderay (1.1.1) | |
- coffee-rails (4.0.1) | |
+ coffee-rails (4.1.1) | |
coffee-script (>= 2.2.0) | |
- railties (>= 4.0.0, < 5.0) | |
+ railties (>= 4.0.0, < 5.1.x) | |
coffee-script (2.4.1) | |
coffee-script-source | |
execjs | |
coffee-script-source (1.10.0) | |
+ concurrent-ruby (1.0.2) | |
database_cleaner (1.5.3) | |
debug_inspector (0.0.2) | |
diff-lcs (1.2.5) | |
@@ -105,10 +107,10 @@ GEM | |
factory_girl_rails (4.7.0) | |
factory_girl (~> 4.7.0) | |
railties (>= 3.0.0) | |
- faker (1.6.3) | |
+ faker (1.6.6) | |
i18n (~> 0.5) | |
- ffi (1.9.10) | |
- ffi-compiler (0.1.3) | |
+ ffi (1.9.14) | |
+ ffi-compiler (1.0.1) | |
ffi (>= 1.0.0) | |
rake | |
filesize (0.1.1) | |
@@ -140,18 +142,18 @@ GEM | |
guard (~> 2.8) | |
guard-compat (~> 1.0) | |
multi_json (~> 1.8) | |
- guard-rails (0.7.2) | |
+ guard-rails (0.8.0) | |
guard (~> 2.11) | |
guard-compat (~> 1.0) | |
- guard-rspec (4.7.2) | |
+ guard-rspec (4.7.3) | |
guard (~> 2.1) | |
guard-compat (~> 1.1) | |
rspec (>= 2.99.0, < 4.0) | |
- hike (1.2.3) | |
http_parser.rb (0.6.0) | |
i18n (0.7.0) | |
- jquery-rails (3.1.4) | |
- railties (>= 3.0, < 5.0) | |
+ jquery-rails (4.2.1) | |
+ rails-dom-testing (>= 1, < 3) | |
+ railties (>= 4.2.0) | |
thor (>= 0.14, < 2.0) | |
jsobfu (0.4.1) | |
rkelly-remix (= 0.0.6) | |
@@ -182,14 +184,14 @@ GEM | |
nokogiri (1.6.8) | |
mini_portile2 (~> 2.1.0) | |
pkg-config (~> 1.1.7) | |
- notiffany (0.1.0) | |
+ notiffany (0.1.1) | |
nenv (~> 0.1) | |
shellany (~> 0.0) | |
pg (0.18.4) | |
pkg-config (1.1.7) | |
protected_attributes (1.0.9) | |
activemodel (>= 4.0.1, < 5.0) | |
- pry (0.10.3) | |
+ pry (0.10.4) | |
coderay (~> 1.1.0) | |
method_source (~> 0.8.1) | |
slop (~> 3.4) | |
@@ -197,16 +199,16 @@ GEM | |
rack (1.6.4) | |
rack-test (0.6.3) | |
rack (>= 1.0) | |
- rails (4.2.7) | |
- actionmailer (= 4.2.7) | |
- actionpack (= 4.2.7) | |
- actionview (= 4.2.7) | |
- activejob (= 4.2.7) | |
- activemodel (= 4.2.7) | |
- activerecord (= 4.2.7) | |
- activesupport (= 4.2.7) | |
+ rails (4.2.7.1) | |
+ actionmailer (= 4.2.7.1) | |
+ actionpack (= 4.2.7.1) | |
+ actionview (= 4.2.7.1) | |
+ activejob (= 4.2.7.1) | |
+ activemodel (= 4.2.7.1) | |
+ activerecord (= 4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
bundler (>= 1.3.0, < 2.0) | |
- railties (= 4.2.7) | |
+ railties (= 4.2.7.1) | |
sprockets-rails | |
rails-deprecated_sanitizer (1.0.3) | |
activesupport (>= 4.2.0.alpha) | |
@@ -216,15 +218,15 @@ GEM | |
rails-deprecated_sanitizer (>= 1.0.1) | |
rails-html-sanitizer (1.0.3) | |
loofah (~> 2.0) | |
- rails-settings-cached (0.4.1) | |
- rails (>= 4.0.0) | |
+ rails-settings-cached (0.6.5) | |
+ rails (>= 4.2.0) | |
rails_layout (1.0.29) | |
- railties (4.2.7) | |
- actionpack (= 4.2.7) | |
- activesupport (= 4.2.7) | |
+ railties (4.2.7.1) | |
+ actionpack (= 4.2.7.1) | |
+ activesupport (= 4.2.7.1) | |
rake (>= 0.8.7) | |
thor (>= 0.18.1, < 2.0) | |
- raindrops (0.16.0) | |
+ raindrops (0.17.0) | |
rake (11.2.2) | |
rb-fsevent (0.9.7) | |
rb-inotify (0.9.7) | |
@@ -246,7 +248,7 @@ GEM | |
rspec-core (~> 3.5.0) | |
rspec-expectations (~> 3.5.0) | |
rspec-mocks (~> 3.5.0) | |
- rspec-core (3.5.0) | |
+ rspec-core (3.5.2) | |
rspec-support (~> 3.5.0) | |
rspec-expectations (3.5.0) | |
diff-lcs (>= 1.2.0, < 2.0) | |
@@ -254,7 +256,7 @@ GEM | |
rspec-mocks (3.5.0) | |
diff-lcs (>= 1.2.0, < 2.0) | |
rspec-support (~> 3.5.0) | |
- rspec-rails (3.5.0) | |
+ rspec-rails (3.5.1) | |
actionpack (>= 3.0) | |
activesupport (>= 3.0) | |
railties (>= 3.0) | |
@@ -263,14 +265,15 @@ GEM | |
rspec-mocks (~> 3.5.0) | |
rspec-support (~> 3.5.0) | |
rspec-support (3.5.0) | |
- ruby_dep (1.3.1) | |
+ ruby_dep (1.4.0) | |
rubyzip (1.2.0) | |
- sass (3.2.19) | |
- sass-rails (4.0.5) | |
- railties (>= 4.0.0, < 5.0) | |
- sass (~> 3.2.2) | |
- sprockets (~> 2.8, < 3.0) | |
- sprockets-rails (~> 2.0) | |
+ sass (3.4.22) | |
+ sass-rails (5.0.6) | |
+ railties (>= 4.0.0, < 6) | |
+ sass (~> 3.1) | |
+ sprockets (>= 2.8, < 4.0) | |
+ sprockets-rails (>= 2.0, < 4.0) | |
+ tilt (>= 1.1, < 3) | |
scrypt (2.1.1) | |
ffi-compiler (>= 0.0.2) | |
rake | |
@@ -282,24 +285,22 @@ GEM | |
shoulda-matchers (2.8.0) | |
activesupport (>= 3.0.0) | |
slop (3.6.0) | |
- sprockets (2.12.4) | |
- hike (~> 1.2) | |
- multi_json (~> 1.0) | |
- rack (~> 1.0) | |
- tilt (~> 1.1, != 1.3.0) | |
- sprockets-rails (2.3.3) | |
- actionpack (>= 3.0) | |
- activesupport (>= 3.0) | |
- sprockets (>= 2.8, < 4.0) | |
+ sprockets (3.7.0) | |
+ concurrent-ruby (~> 1.0) | |
+ rack (> 1, < 3) | |
+ sprockets-rails (3.1.1) | |
+ actionpack (>= 4.0) | |
+ activesupport (>= 4.0) | |
+ sprockets (>= 3.0.0) | |
therubyracer (0.12.2) | |
libv8 (~> 3.16.14.0) | |
ref | |
thor (0.19.1) | |
thread_safe (0.3.5) | |
- tilt (1.4.1) | |
+ tilt (2.0.5) | |
tzinfo (1.2.2) | |
thread_safe (~> 0.1) | |
- uglifier (3.0.0) | |
+ uglifier (3.0.2) | |
execjs (>= 0.3.0, < 3) | |
unicorn (5.1.0) | |
kgio (~> 2.6) | |
@@ -325,8 +326,9 @@ DEPENDENCIES | |
autoprefixer-rails | |
bootstrap-sass (>= 3.2.0) | |
breadcrumbs_on_rails | |
+ byebug | |
capybara | |
- coffee-rails (~> 4.0.1) | |
+ coffee-rails (~> 4.1.0) | |
database_cleaner | |
dynamic_form (>= 1.1.4) | |
factory_girl_rails | |
@@ -339,24 +341,24 @@ DEPENDENCIES | |
guard-rails | |
guard-rspec | |
jquery-datatables-rails! | |
- jquery-rails (>= 3.1.2) | |
+ jquery-rails | |
kissfft | |
launchy | |
- pg (>= 0.17) | |
+ pg (~> 0.15) | |
protected_attributes (~> 1.0.7) | |
psych_shield | |
- rails (= 4.2.7) | |
+ rails (~> 4.2, >= 4.2.7.1) | |
rails-settings-cached (>= 0.4.1) | |
rails_layout | |
reportable! | |
rex (~> 2.0.10) | |
rspec-rails | |
- sass-rails (~> 4.0.2) | |
+ sass-rails (~> 5.0) | |
scrypt | |
selenium-webdriver | |
shoulda-matchers (= 2.8) | |
therubyracer | |
- uglifier (>= 1.0.3) | |
+ uglifier (>= 1.3.0) | |
unicorn | |
web-console (~> 2.0) | |
will_paginate (~> 3.0) | |
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user… | |
@@ -18,6 +18,6 @@ class UserSessionsController < ApplicationController | |
def destroy | |
current_user_session.destroy | |
- redirect_back_or_default login_url | |
+ redirect_back_or_default login_path | |
end | |
end | |
diff --git a/app/models/settings.rb b/app/models/settings.rb | |
@@ -11,6 +11,6 @@ | |
# updated_at :datetime | |
# | |
-class Settings < RailsSettings::CachedSettings | |
+class Settings < RailsSettings::Base | |
attr_accessible :var | |
end | |
diff --git a/app/views/application/_nav.html.erb b/app/views/application/_nav.h… | |
@@ -9,7 +9,9 @@ | |
<span class="fa fa-bar"></span> | |
<span class="fa fa-bar"></span> | |
</button> | |
- <a class="navbar-brand" href="/"><img src="/assets/logo_light.png" borde… | |
+ <a class="navbar-brand" href="/"> | |
+ <%= image_tag "logo_light.png", border: 0, alt: "WarVOX" %> | |
+ </a> | |
</div> | |
<div class="collapse navbar-collapse navbar-ex1-collapse"> | |
diff --git a/app/views/home/about.html.erb b/app/views/home/about.html.erb | |
@@ -43,7 +43,7 @@ and research purposes only. The latest version of WarVOX can … | |
<td> | |
Active Jobs | |
</td> | |
- <td><%= Job.count(:conditions => { :completed_at => nil }) %></td> | |
+ <td><%= Job.where(:completed_at => nil).count %></td> | |
</tr> | |
<tr> | |
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb | |
@@ -23,7 +23,9 @@ | |
</head> | |
<body id="login"> | |
<div id="login-panel"> | |
- <div id="login-logo"><img src="/assets/logo_bigger.png" border=0 alt="WarVOX… | |
+ <div id="login-logo"> | |
+ <%= image_tag "logo_bigger.png", border: 0, alt: "WarVOX" %> | |
+ </div> | |
<div id="box"> | |
<%= yield %> | |
</div> | |
diff --git a/config/environments/development.rb b/config/environments/developme… | |
@@ -27,13 +27,13 @@ Rails.application.configure do | |
# Do not compress assets | |
config.assets.compress = false | |
+ config.serve_static_files = true | |
+ | |
# Debug mode disables concatenation and preprocessing of assets. | |
# This option may cause significant delays in view rendering with a large | |
# number of complex assets. | |
config.assets.debug = false | |
- config.serve_static_files = true | |
- | |
# Asset digests allow you to set far-future HTTP expiration dates on all ass… | |
# yet still be able to expire them through the digest params. | |
config.assets.digest = true | |
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb | |
@@ -10,4 +10,7 @@ Rails.application.config.assets.version = '1.0' | |
# application.js, application.css, and all non-JS/CSS in app/assets folder are… | |
# Rails.application.config.assets.precompile += %w( search.js ) | |
- Rails.application.config.assets.precompile += %w( jquery.js ) | |
+# Rails.application.config.assets.precompile += %w( jquery.js ) | |
+ | |
+Rails.application.config.assets.precompile += %w( html5.js ) | |
+Rails.application.config.assets.precompile += %w(analyze/_index.coffee analyze… | |
diff --git a/config/initializers/bootstrap.rb b/config/initializers/bootstrap.rb |