Update ruby and rails

This commit is contained in:
Jesse C. Fisher 2019-03-11 01:37:35 -07:00
parent bacfbbe411
commit 9a3c468ed7
12 changed files with 370 additions and 323 deletions

View File

@ -1 +1 @@
2.3.0 2.6.0

26
Gemfile
View File

@ -1,13 +1,13 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.3.0' ruby '2.6.0'
gem 'rails', '4.1.8' gem 'rails', '5.2.2'
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails' #, '~> 4.0.3'
gem 'uglifier', '>= 1.3.0' gem 'uglifier' #, '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails' #, '~> 4.0.0'
gem 'jquery-rails' gem 'jquery-rails'
gem 'turbolinks' gem 'turbolinks'
gem 'jbuilder', '~> 2.0' gem 'jbuilder' #, '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', group: :doc #, '~> 0.4.0'
gem 'spring', group: :development gem 'spring', group: :development
gem 'devise' gem 'devise'
gem 'devise_invitable' gem 'devise_invitable'
@ -20,12 +20,11 @@ gem 'simple_form'
gem 'upmin-admin' gem 'upmin-admin'
gem 'dotenv-rails' gem 'dotenv-rails'
gem 'react-rails' gem 'react-rails'
gem 'react-rails-hot-loader' # gem 'react-rails-hot-loader'
group :development do group :development do
gem 'parallel_tests', group: :development gem 'parallel_tests', group: :development
gem 'better_errors' gem 'better_errors'
gem 'rubocop', require: false gem 'rubocop', require: false
gem 'haml-lint', require: false
gem 'binding_of_caller' gem 'binding_of_caller'
gem 'capistrano' gem 'capistrano'
gem 'capistrano-bundler' gem 'capistrano-bundler'
@ -35,15 +34,15 @@ group :development do
gem 'capistrano-rbenv' gem 'capistrano-rbenv'
gem 'capistrano-nginx', github: 'koenpunt/capistrano-nginx' gem 'capistrano-nginx', github: 'koenpunt/capistrano-nginx'
gem "capistrano-db-tasks", require: false gem "capistrano-db-tasks", require: false
gem "capistrano-postgresql", '~> 4.2.0' gem "capistrano-postgresql" #, '~> 4.2.0'
gem 'guard-bundler' gem 'guard-bundler'
gem 'guard-rails' gem 'guard-rails'
gem 'guard-rspec' gem 'guard-rspec'
gem 'guard-livereload', '~> 2.4', require: false gem 'guard-livereload' #, '~> 2.4', require: false
gem "rack-livereload" gem "rack-livereload"
gem 'html2haml' gem 'html2haml'
gem 'hub', require: nil gem 'hub', require: nil
gem 'quiet_assets' # gem 'quiet_assets'
gem 'rails_layout' gem 'rails_layout'
gem 'rb-fchange', require: false gem 'rb-fchange', require: false
gem 'rb-fsevent', require: false gem 'rb-fsevent', require: false
@ -66,6 +65,3 @@ group :test, :staging do
gem 'selenium-webdriver' gem 'selenium-webdriver'
gem 'simplecov', :require => false gem 'simplecov', :require => false
end end
group :production, :staging do
gem 'newrelic_rpm'
end

View File

@ -8,133 +8,159 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.8) actioncable (5.2.2)
actionpack (= 4.1.8) actionpack (= 5.2.2)
actionview (= 4.1.8) nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8) rails-dom-testing (~> 2.0)
actionview (= 4.1.8) actionpack (5.2.2)
activesupport (= 4.1.8) actionview (= 5.2.2)
rack (~> 1.5.2) activesupport (= 5.2.2)
rack-test (~> 0.6.2) rack (~> 2.0)
actionview (4.1.8) rack-test (>= 0.6.3)
activesupport (= 4.1.8) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.2)
activesupport (= 5.2.2)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubi (~> 1.4)
activemodel (4.1.8) rails-dom-testing (~> 2.0)
activesupport (= 4.1.8) rails-html-sanitizer (~> 1.0, >= 1.0.3)
builder (~> 3.1) activejob (5.2.2)
activerecord (4.1.8) activesupport (= 5.2.2)
activemodel (= 4.1.8) globalid (>= 0.3.6)
activesupport (= 4.1.8) activemodel (5.2.2)
arel (~> 5.0.0) activesupport (= 5.2.2)
activesupport (4.1.8) activerecord (5.2.2)
i18n (~> 0.6, >= 0.6.9) activemodel (= 5.2.2)
json (~> 1.7, >= 1.7.7) activesupport (= 5.2.2)
arel (>= 9.0)
activestorage (5.2.2)
actionpack (= 5.2.2)
activerecord (= 5.2.2)
marcel (~> 0.3.1)
activesupport (5.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.4.0) addressable (2.6.0)
arel (5.0.1.20140414130214) public_suffix (>= 2.0.2, < 4.0)
ast (2.2.0) airbrussh (1.3.1)
sshkit (>= 1.6.1, != 1.7.0)
arel (9.0.0)
ast (2.4.0)
babel-source (5.8.35) babel-source (5.8.35)
babel-transpiler (0.7.0) babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6) babel-source (>= 4.0, < 6)
execjs (~> 2.0) execjs (~> 2.0)
bcrypt (3.1.10) bcrypt (3.1.12)
better_errors (2.1.1) better_errors (2.5.1)
coderay (>= 1.0.0) coderay (>= 1.0.0)
erubis (>= 2.6.6) erubi (>= 1.0.0)
rack (>= 0.9.0) rack (>= 0.9.0)
binding_of_caller (0.7.2) binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.2) builder (3.2.3)
capistrano (3.4.0) capistrano (3.11.0)
airbrussh (>= 1.0.0)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (~> 1.3) sshkit (>= 1.9.0)
capistrano-bundler (1.1.4) capistrano-bundler (1.5.0)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.2) capistrano-db-tasks (0.6)
capistrano-db-tasks (0.4)
capistrano (>= 3.0.0) capistrano (>= 3.0.0)
capistrano-postgresql (4.2.1) capistrano-postgresql (6.2.0)
capistrano (>= 3.0) capistrano (>= 3.0)
capistrano-rails (1.1.6) sshkit (>= 1.17.0)
capistrano-rails (1.4.0)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano-rails-console (1.0.2) capistrano-rails-console (2.3.0)
capistrano (>= 3.1.0, < 4.0.0) capistrano (>= 3.5.0, < 4.0.0)
capistrano-rbenv (2.0.4) sshkit-interactive (~> 0.3.0)
capistrano-rbenv (2.1.4)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano3-puma (1.2.1) capistrano3-puma (3.1.1)
capistrano (~> 3.0) capistrano (~> 3.7)
puma (>= 2.6) capistrano-bundler
capybara (2.6.2) puma (~> 3.4)
capybara (3.14.0)
addressable addressable
mime-types (>= 1.16) mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3) nokogiri (~> 1.8)
rack (>= 1.0.0) rack (>= 1.6.0)
rack-test (>= 0.5.4) rack-test (>= 0.6.3)
xpath (~> 2.0) regexp_parser (~> 1.2)
chartkick (1.4.1) xpath (~> 3.2)
childprocess (0.5.9) chartkick (3.0.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.0) coderay (1.1.2)
coffee-rails (4.0.1) coffee-rails (4.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.12.2)
connection_pool (2.2.0) concurrent-ruby (1.1.4)
database_cleaner (1.5.1) connection_pool (2.2.2)
debug_inspector (0.0.2) crass (1.0.4)
devise (3.5.6) database_cleaner (1.7.0)
debug_inspector (0.0.3)
devise (4.6.1)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 4.1.0, < 6.0)
responders responders
thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise_invitable (1.5.5) devise_invitable (2.0.0)
actionmailer (>= 3.2.6, < 5) actionmailer (>= 5.0)
devise (>= 3.2.0) devise (>= 4.6)
diff-lcs (1.2.5) diff-lcs (1.3)
docile (1.1.5) docile (1.3.1)
dotenv (2.1.0) dotenv (2.7.1)
dotenv-rails (2.1.0) dotenv-rails (2.7.1)
dotenv (= 2.1.0) dotenv (= 2.7.1)
railties (>= 4.0, < 5.1) railties (>= 3.2, < 6.1)
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
erubi (1.8.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.9.1) eventmachine (1.2.7)
execjs (2.6.0) execjs (2.7.0)
factory_girl (4.5.0) factory_girl (4.9.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.6.0) factory_girl_rails (4.9.0)
factory_girl (~> 4.5.0) factory_girl (~> 4.9.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faker (1.6.1) faker (1.9.3)
i18n (~> 0.5) i18n (>= 0.7)
ffi (1.9.10) ffi (1.10.0)
formatador (0.2.5) formatador (0.2.5)
guard (2.13.0) globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (>= 2.7, <= 4.0) listen (>= 2.7, < 4.0)
lumberjack (~> 1.0) lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1) nenv (~> 0.1)
notiffany (~> 0.0) notiffany (~> 0.0)
pry (>= 0.9.12) pry (>= 0.9.12)
shellany (~> 0.0) shellany (~> 0.0)
thor (>= 0.18.1) thor (>= 0.18.1)
guard-bundler (2.1.0) guard-bundler (2.2.1)
bundler (~> 1.0) bundler (>= 1.3.0, < 3)
guard (~> 2.2) guard (~> 2.2)
guard-compat (~> 1.1) guard-compat (~> 1.1)
guard-compat (1.2.1) guard-compat (1.2.1)
@ -146,230 +172,251 @@ GEM
guard (~> 2.8) guard (~> 2.8)
guard-compat (~> 1.0) guard-compat (~> 1.0)
multi_json (~> 1.8) multi_json (~> 1.8)
guard-rails (0.7.2) guard-rails (0.8.1)
guard (~> 2.11) guard (~> 2.11)
guard-compat (~> 1.0) guard-compat (~> 1.0)
guard-rspec (4.6.4) guard-rspec (4.7.3)
guard (~> 2.1) guard (~> 2.1)
guard-compat (~> 1.1) guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0) rspec (>= 2.99.0, < 4.0)
haml (4.0.7) haml (5.0.4)
temple (>= 0.8.0)
tilt tilt
haml-lint (0.13.0) haml-rails (2.0.0)
haml (~> 4.0) actionpack (>= 5.1)
rubocop (>= 0.25.0) activesupport (>= 5.1)
sysexits (~> 1.1) haml (>= 4.0.6, < 6.0)
haml-rails (0.9.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1) html2haml (>= 1.0.1)
railties (>= 4.0.1) railties (>= 5.1)
high_voltage (2.4.0) high_voltage (3.1.0)
hike (1.2.3) html2haml (2.2.0)
html2haml (2.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
haml (~> 4.0.0) haml (>= 4.0, < 6)
nokogiri (~> 1.6.0) nokogiri (>= 1.6.0)
ruby_parser (~> 3.5) ruby_parser (~> 3.5)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
hub (1.12.4) hub (1.12.4)
i18n (0.7.0) i18n (1.6.0)
concurrent-ruby (~> 1.0)
interception (0.5) interception (0.5)
jbuilder (2.4.1) jaro_winkler (1.5.2)
activesupport (>= 3.0.0, < 5.1) jbuilder (2.8.0)
multi_json (~> 1.2) activesupport (>= 4.2.0)
jquery-rails (3.1.4) multi_json (>= 1.2)
railties (>= 3.0, < 5.0) jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.3) json (2.2.0)
kaminari (0.16.3) kaminari (1.1.1)
actionpack (>= 3.0.0) activesupport (>= 4.1.0)
activesupport (>= 3.0.0) kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
listen (3.0.6) listen (3.1.5)
rb-fsevent (>= 0.9.3) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (>= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
lumberjack (1.0.10) ruby_dep (~> 1.2)
mail (2.6.3) loofah (2.2.3)
mime-types (>= 1.16, < 3) crass (~> 1.0.2)
method_source (0.8.2) nokogiri (>= 1.5.9)
mime-types (2.99) lumberjack (1.0.13)
mini_portile2 (2.0.0) mail (2.7.1)
minitest (5.8.4) mini_mime (>= 0.1.1)
multi_json (1.11.2) marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
nenv (0.3.0) nenv (0.3.0)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (3.0.2) net-ssh (5.1.0)
newrelic_rpm (3.14.3.313) nio4r (2.3.1)
nokogiri (1.6.7.2) nokogiri (1.10.1)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.4.0)
notiffany (0.0.8) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.6.1) parallel (1.14.0)
parallel_tests (2.2.1) parallel_tests (2.28.0)
parallel parallel
parser (2.3.0.5) parser (2.6.0.0)
ast (~> 2.2) ast (~> 2.4.0)
pg (0.18.4) pg (1.1.4)
poltergeist (1.9.0) poltergeist (1.18.1)
capybara (~> 2.1) capybara (>= 2.1, < 4)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
polyamorous (1.3.0) powerpack (0.1.2)
activerecord (>= 3.0) pry (0.12.2)
powerpack (0.1.1)
pry (0.10.3)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.9.0)
slop (~> 3.4) pry-rails (0.3.9)
pry-rails (0.3.4) pry (>= 0.10.4)
pry (>= 0.9.10) pry-rescue (1.5.0)
pry-rescue (1.4.2)
interception (>= 0.5) interception (>= 0.5)
pry pry (>= 0.12.0)
puma (2.16.0) psych (3.1.0)
pundit (1.1.0) public_suffix (3.0.3)
puma (3.12.0)
pundit (2.0.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
quiet_assets (1.1.0) rack (2.0.6)
railties (>= 3.1, < 5.0) rack-livereload (0.3.17)
rack (1.5.5)
rack-livereload (0.3.16)
rack rack
rack-test (0.6.3) rack-test (1.1.0)
rack (>= 1.0) rack (>= 1.0, < 3)
rails (4.1.8) rails (5.2.2)
actionmailer (= 4.1.8) actioncable (= 5.2.2)
actionpack (= 4.1.8) actionmailer (= 5.2.2)
actionview (= 4.1.8) actionpack (= 5.2.2)
activemodel (= 4.1.8) actionview (= 5.2.2)
activerecord (= 4.1.8) activejob (= 5.2.2)
activesupport (= 4.1.8) activemodel (= 5.2.2)
bundler (>= 1.3.0, < 2.0) activerecord (= 5.2.2)
railties (= 4.1.8) activestorage (= 5.2.2)
sprockets-rails (~> 2.0) activesupport (= 5.2.2)
rails_layout (1.0.29) bundler (>= 1.3.0)
railties (4.1.8) railties (= 5.2.2)
actionpack (= 4.1.8) sprockets-rails (>= 2.0.0)
activesupport (= 4.1.8) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails_layout (1.0.42)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.19.0, < 2.0)
rainbow (2.1.0) rainbow (3.0.0)
rake (10.5.0) rake (12.3.2)
ransack (1.7.0) ransack (2.1.1)
actionpack (>= 3.0) actionpack (>= 5.0)
activerecord (>= 3.0) activerecord (>= 5.0)
activesupport (>= 3.0) activesupport (>= 5.0)
i18n i18n
polyamorous (~> 1.2)
rb-fchange (0.0.6) rb-fchange (0.0.6)
ffi ffi
rb-fsevent (0.9.7) rb-fsevent (0.10.3)
rb-inotify (0.9.7) rb-inotify (0.10.0)
ffi (>= 0.5.0) ffi (~> 1.0)
rdoc (4.2.2) rdoc (6.1.1)
json (~> 1.4) react-rails (2.4.7)
react-rails (1.6.0)
babel-transpiler (>= 0.7.0) babel-transpiler (>= 0.7.0)
coffee-script-source (~> 1.8)
connection_pool connection_pool
execjs execjs
rails (>= 3.2) railties (>= 3.2)
tilt tilt
react-rails-hot-loader (0.5.0) regexp_parser (1.3.0)
em-websocket responders (2.4.1)
rails actionpack (>= 4.2.0, < 6.0)
react-rails railties (>= 4.2.0, < 6.0)
responders (1.1.2) rspec (3.8.0)
railties (>= 3.2, < 4.2) rspec-core (~> 3.8.0)
rspec (3.4.0) rspec-expectations (~> 3.8.0)
rspec-core (~> 3.4.0) rspec-mocks (~> 3.8.0)
rspec-expectations (~> 3.4.0) rspec-core (3.8.0)
rspec-mocks (~> 3.4.0) rspec-support (~> 3.8.0)
rspec-core (3.4.2) rspec-expectations (3.8.2)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.8.0)
rspec-mocks (3.4.1) rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.8.0)
rspec-rails (3.4.2) rspec-rails (3.8.2)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rubocop (0.37.2)
parser (>= 2.3.0.4, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 0.3)
ruby-progressbar (1.7.5)
ruby_parser (3.7.3)
sexp_processor (~> 4.1)
rubyzip (1.1.7)
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)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
selenium-webdriver (2.52.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
sexp_processor (4.6.1)
shellany (0.0.1)
simple_form (3.2.1)
actionpack (> 4, < 5.1)
activemodel (> 4, < 5.1)
simplecov (0.10.0)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spring (1.6.3)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
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) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.65.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
ruby_parser (3.12.0)
sexp_processor (~> 4.9)
rubyzip (1.2.2)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sshkit (1.8.1) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (1.0.0)
rdoc (>= 5.0)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
sexp_processor (4.11.0)
shellany (0.0.1)
simple_form (4.1.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.18.2)
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
sysexits (1.2.0) sshkit-interactive (0.3.0)
thor (0.19.1) sshkit (~> 1.12)
thread_safe (0.3.5) temple (0.8.1)
tilt (1.4.1) thor (0.20.3)
turbolinks (2.5.3) thread_safe (0.3.6)
coffee-rails tilt (2.0.9)
tzinfo (1.2.2) turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.7.2) uglifier (4.1.20)
execjs (>= 0.3.0) execjs (>= 0.3.0, < 3)
json (>= 1.8.0) unicode-display_width (1.4.1)
unicode-display_width (0.3.1)
upmin-admin (0.1.3) upmin-admin (0.1.3)
chartkick chartkick
haml (>= 3.0.0) haml (>= 3.0.0)
@ -378,14 +425,13 @@ GEM
rails rails
ransack ransack
sass-rails sass-rails
warden (1.2.6) warden (1.2.8)
rack (>= 1.0) rack (>= 2.0.6)
websocket (1.2.2) websocket-driver (0.7.0)
websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2) websocket-extensions (0.1.3)
xpath (2.0.0) xpath (3.2.0)
nokogiri (~> 1.3) nokogiri (~> 1.8)
PLATFORMS PLATFORMS
ruby ruby
@ -397,13 +443,13 @@ DEPENDENCIES
capistrano-bundler capistrano-bundler
capistrano-db-tasks capistrano-db-tasks
capistrano-nginx! capistrano-nginx!
capistrano-postgresql (~> 4.2.0) capistrano-postgresql
capistrano-rails capistrano-rails
capistrano-rails-console capistrano-rails-console
capistrano-rbenv capistrano-rbenv
capistrano3-puma capistrano3-puma
capybara capybara
coffee-rails (~> 4.0.0) coffee-rails
database_cleaner database_cleaner
devise devise
devise_invitable devise_invitable
@ -412,18 +458,16 @@ DEPENDENCIES
faker faker
guard-bundler guard-bundler
guard-ctags-bundler guard-ctags-bundler
guard-livereload (~> 2.4) guard-livereload
guard-rails guard-rails
guard-rspec guard-rspec
haml-lint
haml-rails haml-rails
high_voltage high_voltage
html2haml html2haml
hub hub
jbuilder (~> 2.0) jbuilder
jquery-rails jquery-rails
launchy launchy
newrelic_rpm
parallel_tests parallel_tests
pg pg
poltergeist poltergeist
@ -431,27 +475,28 @@ DEPENDENCIES
pry-rescue pry-rescue
puma puma
pundit pundit
quiet_assets
rack-livereload rack-livereload
rails (= 4.1.8) rails (= 5.2.2)
rails_layout rails_layout
rb-fchange rb-fchange
rb-fsevent rb-fsevent
rb-inotify rb-inotify
react-rails react-rails
react-rails-hot-loader
rspec-rails rspec-rails
rubocop rubocop
sass-rails (~> 4.0.3) sass-rails
sdoc (~> 0.4.0) sdoc
selenium-webdriver selenium-webdriver
simple_form simple_form
simplecov simplecov
spring spring
spring-commands-rspec spring-commands-rspec
turbolinks turbolinks
uglifier (>= 1.3.0) uglifier
upmin-admin upmin-admin
RUBY VERSION
ruby 2.6.0p0
BUNDLED WITH BUNDLED WITH
1.11.2 1.17.2

View File

@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
# Prevent CSRF attacks by raising an exception. # Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead. # For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception protect_from_forgery with: :exception
after_filter :flash_to_http_header after_action :flash_to_http_header
if (Rails.env.development? || Rails.env.test?) if (Rails.env.development? || Rails.env.test?)
# https://github.com/RailsApps/rails-devise-pundit/issues/10 # https://github.com/RailsApps/rails-devise-pundit/issues/10

View File

@ -1,6 +1,6 @@
class Users::RegistrationsController < Devise::RegistrationsController class Users::RegistrationsController < Devise::RegistrationsController
before_filter :configure_sign_up_params, only: [:create] before_action :configure_sign_up_params, only: [:create]
# before_filter :configure_account_update_params, only: [:update] # before_action :configure_account_update_params, only: [:update]
# GET /resource/sign_up # GET /resource/sign_up
# def new # def new

View File

@ -4,7 +4,7 @@ class CreateAdminService
user.password = Rails.application.secrets.admin_password user.password = Rails.application.secrets.admin_password
user.password_confirmation = Rails.application.secrets.admin_password user.password_confirmation = Rails.application.secrets.admin_password
user.soft_token = Rails.application.secrets.admin_soft_token user.soft_token = Rails.application.secrets.admin_soft_token
user.confirm! user.confirm
user.admin! user.admin!
end end
end end

View File

@ -1,13 +1,4 @@
# Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) require 'bundler/setup' # Set up gems listed in the Gemfile.
# require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
require 'rails/commands/server'
module Rails
class Server
def default_options
super.merge(Host: '127.0.0.1', Port: 3000)
end
end
end

View File

@ -0,0 +1,15 @@
default: &default
adapter: postgresql
encoding: unicode
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
template: template0
password:
development:
<<: *default
database: thirteen_development
production:
<<: *default
database: thirteen_production
username: <%= ENV['THIRTEEN_DB_USER'] %>
password: <%= ENV['THIRTEEN_DB_PASSWORD'] %>

View File

@ -2,7 +2,7 @@ module DevisePermittedParameters
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do
before_filter :configure_permitted_parameters before_action :configure_permitted_parameters
end end
protected protected

View File

@ -8,8 +8,8 @@ module PunditHelper
included do included do
include Pundit include Pundit
# https://github.com/elabs/pundit#ensuring-policies-are-used # https://github.com/elabs/pundit#ensuring-policies-are-used
#after_filter :verify_authorized, except: :index #after_action :verify_authorized, except: :index
#after_filter :verify_policy_scoped, only: :index #after_action :verify_policy_scoped, only: :index
rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
end end

View File

@ -6,8 +6,8 @@ module AdminOnly
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do
before_filter :authenticate_user! before_action :authenticate_user!
before_filter :admin_only before_action :admin_only
end end
private private

View File

@ -11,13 +11,13 @@
# if you're sharing your code publicly. # if you're sharing your code publicly.
development: development:
admin_name: First User admin_name: Wizard of Hearts
admin_email: user@example.com admin_email: jesse@quaff.top
admin_password: changeme admin_password: changeme
admin_soft_token: SeedToken admin_soft_token: SeedToken
email_provider_username: <%= ENV["GMAIL_USERNAME"] %> email_provider_username: <%= ENV["GMAIL_USERNAME"] %>
email_provider_password: <%= ENV["GMAIL_PASSWORD"] %> email_provider_password: <%= ENV["GMAIL_PASSWORD"] %>
domain_name: example.com domain_name: 13dev.quaff.top
secret_key_base: 31b41a9c65cd195a147284c28603ad690792213a13157935f4de1fb232ce3283a44ec52f4d5e9a3c0df041e4b19536d739246616d26d147081dc1c906288771d secret_key_base: 31b41a9c65cd195a147284c28603ad690792213a13157935f4de1fb232ce3283a44ec52f4d5e9a3c0df041e4b19536d739246616d26d147081dc1c906288771d
test: test: