diff --git a/.gitignore b/.gitignore index fd5fb22..db0e05c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ .DS_Store .env .ruby-gemset -.byebug_history \ No newline at end of file +.byebug_history +/vendor \ No newline at end of file diff --git a/Gemfile b/Gemfile index 7772687..74bf373 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" ruby File.read(File.join(File.dirname(__FILE__), ".ruby-version")).strip -gem "rails", "~> 5.0.0" +gem "rails", "~> 6.1.0" -gem "attr_encrypted" +gem "attr_encrypted", "~> 3.1.0" gem "bootstrap-sass", "~> 3.3.4" gem "bootstrap-scss" gem "carrierwave" @@ -46,7 +46,7 @@ group :test do gem "database_cleaner" gem "faker" gem "launchy" - gem "show_me_the_cookies", '~> 5.0.1' + gem "show_me_the_cookies", '~> 6.0.0' gem "timecop" end @@ -57,3 +57,5 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index bed085a..24ed5a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,65 +1,87 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.7.2) - actionpack (= 5.0.7.2) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + mail (>= 2.7.1) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7.2) - actionview (= 5.0.7.2) - activesupport (= 5.0.7.2) - rack (~> 2.0) - rack-test (~> 0.6.3) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) + rack (~> 2.0, >= 2.0.9) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.2) - activesupport (= 5.0.7.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + nokogiri (>= 1.8.5) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7.2) - activesupport (= 5.0.7.2) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (5.0.7.2) - activesupport (= 5.0.7.2) - activerecord (5.0.7.2) - activemodel (= 5.0.7.2) - activesupport (= 5.0.7.2) - arel (~> 7.0) - activesupport (5.0.7.2) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - arel (7.1.4) ast (2.4.2) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - autoprefixer-rails (10.4.7.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) - better_errors (2.9.1) - coderay (>= 1.0.0) + base64 (0.2.0) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) + rouge (>= 1.0.0) bindex (0.8.1) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap-scss (0.0.3) - bugsnag (6.25.1) + bugsnag (6.26.0) concurrent-ruby (~> 1.0) builder (3.2.4) byebug (11.1.3) - capybara (3.38.0) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -71,24 +93,22 @@ GEM capybara-selenium (0.0.6) capybara selenium-webdriver - carrierwave (2.2.3) - activemodel (>= 5.0.0) - activesupport (>= 5.0.0) + carrierwave (3.0.5) + activemodel (>= 6.0.0) + activesupport (>= 6.0.0) addressable (~> 2.6) image_processing (~> 1.1) marcel (~> 1.0.0) - mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) - coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.3) + date (3.3.4) diff-lcs (1.5.0) dotenv (2.8.1) dotenv-rails (2.8.1) @@ -98,24 +118,24 @@ GEM activemodel encryptor (3.0.0) erubi (1.12.0) - erubis (2.7.0) - execjs (2.8.1) + execjs (2.9.1) factory_girl (4.9.0) activesupport (>= 3.0.0) factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) - faker (3.1.0) + faker (3.2.2) i18n (>= 1.8.11, < 2) - faraday (2.7.3) + faraday (2.7.12) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - ffi (1.15.5) - globalid (1.0.1) - activesupport (>= 5.0) + ffi (1.16.3) + globalid (1.2.1) + activesupport (>= 6.1) hashie (5.0.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -123,12 +143,13 @@ GEM jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - jwt (2.6.0) + jwt (2.7.1) + kgio (2.11.4) launchy (2.5.2) addressable (~> 2.8) listen (3.0.8) @@ -138,10 +159,10 @@ GEM logstasher (0.6.5) logstash-event (~> 1.2.0) request_store - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.8.0.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -150,22 +171,24 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_magick (4.12.0) - mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) + mini_mime (1.1.5) + minitest (5.20.0) multi_xml (0.6.0) - net-imap (0.3.4) + net-imap (0.4.7) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol - nio4r (2.5.8) - nokogiri (1.14.0) - mini_portile2 (~> 2.8.0) + nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.15.5-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) @@ -174,8 +197,8 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - okcomputer (1.18.4) - omniauth (2.1.0) + okcomputer (1.18.5) + omniauth (2.1.1) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -187,77 +210,84 @@ GEM omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) - parallel (1.22.1) - parser (3.2.0.0) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pg (1.4.5) + racc + pg (1.5.4) pickadate-rails (3.5.6.0) railties (>= 3.1.0) - public_suffix (5.0.1) + public_suffix (5.0.4) puma (3.12.6) - racc (1.6.2) - rack (2.2.6.2) - rack-protection (3.0.5) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.7.2) - actioncable (= 5.0.7.2) - actionmailer (= 5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) - activemodel (= 5.0.7.2) - activerecord (= 5.0.7.2) - activesupport (= 5.0.7.2) - bundler (>= 1.3.0) - railties (= 5.0.7.2) + racc (1.7.3) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + rack-test (2.1.0) + rack (>= 1.3) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + bundler (>= 1.15.0) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.0.7.2) - actionpack (= 5.0.7.2) - activesupport (= 5.0.7.2) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) - rake (13.0.6) + raindrops (0.20.1) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rdoc (4.3.0) - recaptcha (5.12.3) - json - regexp_parser (2.6.2) + recaptcha (5.16.0) + regexp_parser (2.8.3) request_store (1.5.1) rack (>= 1.4) - rexml (3.2.5) - rspec-core (3.12.0) + rexml (3.2.6) + rouge (4.2.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (4.1.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.12.0) + rspec-rails (6.1.0) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) rubocop (1.31.0) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -267,10 +297,10 @@ GEM rubocop-ast (>= 1.18.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) - ruby-vips (2.1.4) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) + ruby-vips (2.2.0) ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -290,19 +320,17 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - selenium-webdriver (4.7.1) + selenium-webdriver (4.9.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - show_me_the_cookies (5.0.1) + show_me_the_cookies (6.0.0) capybara (>= 2, < 4) - simple_form (5.0.3) - actionpack (>= 5.0) - activemodel (>= 5.0) - skylight (4.3.2) - skylight-core (= 4.3.2) - skylight-core (4.3.2) - activesupport (>= 4.2.0) + simple_form (5.3.0) + actionpack (>= 5.2) + activemodel (>= 5.2) + skylight (6.0.1) + activesupport (>= 5.2.0) snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) @@ -310,44 +338,47 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - ssrf_filter (1.1.1) - thor (1.2.1) - thread_safe (0.3.6) - tilt (2.0.11) - timecop (0.9.6) - timeout (0.3.1) - tzinfo (1.2.10) - thread_safe (~> 0.1) + ssrf_filter (1.1.2) + thor (1.3.0) + tilt (2.3.0) + timecop (0.9.8) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.4.2) - version_gem (1.1.1) - web-console (3.7.0) - actionview (>= 5.0) - activemodel (>= 5.0) + unicode-display_width (2.5.0) + unicorn (6.1.0) + kgio (~> 2.6) + raindrops (~> 0.7) + version_gem (1.1.3) + web-console (4.2.1) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) bindex (>= 0.4.0) - railties (>= 5.0) - websocket (1.2.9) - websocket-driver (0.6.5) + railties (>= 6.0.0) + websocket (1.2.10) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.6.12) PLATFORMS - ruby + arm64-darwin-22 x86_64-darwin x86_64-linux DEPENDENCIES - attr_encrypted + attr_encrypted (~> 3.1.0) better_errors bootstrap-sass (~> 3.3.4) bootstrap-scss @@ -372,24 +403,25 @@ DEPENDENCIES pg pickadate-rails puma (~> 3.0) - rails (~> 5.0.0) + rails (~> 6.1.0) rails_12factor recaptcha rspec-rails rubocop sassc-rails sdoc (~> 0.4.0) - show_me_the_cookies (~> 5.0.1) + show_me_the_cookies (~> 6.0.0) simple_form skylight spring-watcher-listen (~> 2.0.0) timecop tzinfo-data uglifier (>= 1.3.0) + unicorn web-console RUBY VERSION ruby 2.7.7p221 BUNDLED WITH - 2.4.4 + 2.4.22 diff --git a/app/controllers/decrypted_secrets_controller.rb b/app/controllers/decrypted_secrets_controller.rb index d462886..a94a790 100644 --- a/app/controllers/decrypted_secrets_controller.rb +++ b/app/controllers/decrypted_secrets_controller.rb @@ -1,7 +1,7 @@ class DecryptedSecretsController < ApplicationController include RetrieveSecret - before_filter :retrieve_secret - before_filter :require_validated_email + before_action :retrieve_secret + before_action :require_validated_email def create begin diff --git a/app/controllers/secrets_controller.rb b/app/controllers/secrets_controller.rb index 91fe1b3..940e20a 100644 --- a/app/controllers/secrets_controller.rb +++ b/app/controllers/secrets_controller.rb @@ -1,7 +1,7 @@ class SecretsController < ApplicationController include RetrieveSecret - before_filter :retrieve_secret, only: :show - before_filter :require_validated_email, only: [:new, :create] + before_action :retrieve_secret, only: :show + before_action :require_validated_email, only: [:new, :create] def show # As the receipient has now clicked a link, we know their email address is also diff --git a/app/models/user.rb b/app/models/user.rb index 23ab7ae..cfd6be9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,11 +3,11 @@ class User < ApplicationRecord # :lockable, :timeoutable and :omniauthable after_create :create_settings - devise :registerable, :confirmable, - :recoverable, :rememberable, :trackable, :validatable + # devise :registerable, :confirmable, + # :recoverable, :rememberable, :trackable, :validatable - devise :two_factor_authenticatable, - otp_secret_encryption_key: Rails.configuration.topsekrit_2fa_key + # devise :two_factor_authenticatable, + # otp_secret_encryption_key: Rails.configuration.topsekrit_2fa_key validate :email_authorised?, on: :create diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f8dea37..b58ecbc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,5 +17,11 @@ <%= render partial: 'shared/footer' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <% unless ENV['DEFAULT_HOST'] == 'secretlink.org' %> +

+ Rails version <%= Rails::VERSION::STRING %> | + Ruby version <%= RUBY_VERSION %> +

+ <% end %> diff --git a/bin/rails b/bin/rails index 0739660..21d3e02 100755 --- a/bin/rails +++ b/bin/rails @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +load File.expand_path("spring", __dir__) APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' +require_relative "../config/boot" +require "rails/commands" diff --git a/bin/rake b/bin/rake index 1724048..7327f47 100755 --- a/bin/rake +++ b/bin/rake @@ -1,4 +1,5 @@ #!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' +load File.expand_path("spring", __dir__) +require_relative "../config/boot" +require "rake" Rake.application.run diff --git a/bin/setup b/bin/setup index 98ea9a7..5792302 100755 --- a/bin/setup +++ b/bin/setup @@ -1,17 +1,16 @@ #!/usr/bin/env ruby -require 'pathname' -require 'fileutils' -include FileUtils +require "fileutils" # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") end -chdir APP_ROOT do - # This script is a starting point to setup your application. +FileUtils.chdir APP_ROOT do + # This script is a way to set up or update your development environment automatically. + # This script is idempotent, so that you can run it at any time and get an expectable outcome. # Add necessary setup steps to this file. puts '== Installing dependencies ==' @@ -20,15 +19,15 @@ chdir APP_ROOT do # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') - # cp 'config/database.yml.sample', 'config/database.yml' + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' # end puts "\n== Preparing database ==" - system! 'bin/rails db:setup' + system! 'bin/rails db:prepare' puts "\n== Removing old logs and tempfiles ==" system! 'bin/rails log:clear tmp:clear' puts "\n== Restarting application server ==" system! 'bin/rails restart' -end \ No newline at end of file +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000..b4147e8 --- /dev/null +++ b/bin/spring @@ -0,0 +1,14 @@ +#!/usr/bin/env ruby +if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"]) + gem "bundler" + require "bundler" + + # Load Spring without loading other gems in the Gemfile, for speed. + Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring| + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem "spring", spring.version + require "spring/binstub" + rescue Gem::LoadError + # Ignore when Spring is not installed. + end +end diff --git a/config.ru b/config.ru index f7ba0b5..4a3c09a 100644 --- a/config.ru +++ b/config.ru @@ -1,5 +1,6 @@ # This file is used by Rack-based servers to start the application. -require_relative 'config/environment' +require_relative "config/environment" run Rails.application +Rails.application.load_server diff --git a/config/application.rb b/config/application.rb index 933eead..bec8f98 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,6 +1,6 @@ -require_relative 'boot' +require_relative "boot" -require 'rails/all' +require "rails/all" # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. @@ -8,17 +8,20 @@ module Topsekrit class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.0 + + # Configuration for the application, engines, and railties goes here. + # + # These settings can be overridden in specific environments using the files + # in config/environments, which are processed later. + # + # config.time_zone = "Central Time (US & Canada)" + # config.eager_load_paths << Rails.root.join("extras") config.skylight.environments += ['staging'] config.skylight.alert_log_file = true - - # config.skylight.environments += ['staging'] - - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - config.filter_parameters << :secret end end diff --git a/config/boot.rb b/config/boot.rb index 30f5120..d69bd27 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,3 +1,3 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) -require 'bundler/setup' # Set up gems listed in the Gemfile. +require "bundler/setup" # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml index 0bbde6f..7b40a9b 100644 --- a/config/cable.yml +++ b/config/cable.yml @@ -2,8 +2,9 @@ development: adapter: async test: - adapter: async + adapter: test production: adapter: redis - url: redis://localhost:6379/1 + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: topsekrit_production diff --git a/config/environment.rb b/config/environment.rb index 426333b..cac5315 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,5 @@ # Load the Rails application. -require_relative 'application' +require_relative "application" # Initialize the Rails application. Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb index 5ffbdf8..be05098 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,8 +1,10 @@ +require "active_support/core_ext/integer/time" + Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development + # In the development environment your application's code is reloaded any time + # it changes. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. config.cache_classes = false @@ -12,35 +14,45 @@ # Show full error reports. config.consider_all_requests_local = true - # Enable CSRF Tokens per form - config.action_controller.per_form_csrf_tokens = true - config.action_controller.forgery_protection_origin_check = true - # Enable/disable caching. By default caching is disabled. - if Rails.root.join('tmp/caching-dev.txt').exist? + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? config.action_controller.perform_caching = true - config.action_mailer.perform_caching = true + config.action_controller.enable_fragment_cache_logging = true config.cache_store = :memory_store config.public_file_server.headers = { - 'Cache-Control' => 'public, max-age=172800' + 'Cache-Control' => "public, max-age=#{2.days.to_i}" } else config.action_controller.perform_caching = false - config.action_mailer.perform_caching = false config.cache_store = :null_store end + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false + config.action_mailer.perform_caching = false + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log + # Raise exceptions for disallowed deprecations. + config.active_support.disallowed_deprecation = :raise + + # Tell Active Support which deprecation messages to disallow. + config.active_support.disallowed_deprecation_warnings = [] + # Raise an error on page load if there are pending migrations. config.active_record.migration_error = :page_load + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = 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. @@ -49,6 +61,19 @@ # Suppress logger output for asset requests. config.assets.quiet = true + # Raises error for missing translations. + # config.i18n.raise_on_missing_translations = true + + # Annotate rendered view with file names. + # config.action_view.annotate_rendered_view_with_filenames = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + # Uncomment if you wish to allow Action Cable access from any origin. + # config.action_cable.disable_request_forgery_protection = true + # Emails via Mailcatcher # `gem install mailcatcher` (it's not in the Gemfile) # Launche the server in the terminal with `mailcatcher` @@ -58,11 +83,4 @@ config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 } config.action_mailer.default_options = {from: 'SecretLink.org Sharing '} - - # Raises error for missing translations - # config.action_view.raise_on_missing_translations = true - - # Use an evented file watcher to asynchronously detect changes in source code, - # routes, locales, etc. This feature depends on the listen gem. - config.file_watcher = ActiveSupport::EventedFileUpdateChecker end diff --git a/config/environments/production.rb b/config/environments/production.rb index 8e712b5..9588c8f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,3 +1,5 @@ +require "active_support/core_ext/integer/time" + Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. @@ -10,45 +12,51 @@ # Rake tasks automatically ignore this option for performance. config.eager_load = true + # Enable CSRF Tokens per form + config.action_controller.per_form_csrf_tokens = true + config.action_controller.forgery_protection_origin_check = true + # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true - # Enable CSRF Tokens per form - config.action_controller.per_form_csrf_tokens = true - config.action_controller.forgery_protection_origin_check = true + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier + # Compress CSS using a preprocessor. # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false - # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - + # config.asset_host = 'http://assets.example.com' # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - # Mount Action Cable outside main process or domain + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. # config.action_cable.mount_path = nil # config.action_cable.url = 'wss://example.com/cable' # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - config.force_ssl = true + # config.force_ssl = true - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. + # Include generic and useful information about system operation, but avoid logging too much + # information to avoid inadvertent exposure of personally identifiable information (PII). config.log_level = :debug # Prepend all log lines with the following tags. @@ -57,9 +65,10 @@ # Use a different cache store in production. # config.cache_store = :mem_cache_store - # Use a real queuing backend for Active Job (and separate queues per environment) + # Use a real queuing backend for Active Job (and separate queues per environment). # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "railsdiff_#{Rails.env}" + # config.active_job.queue_name_prefix = "topsekrit_production" + config.action_mailer.perform_caching = true # Ignore bad email addresses and do not raise email delivery errors. @@ -73,22 +82,49 @@ # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify + # Log disallowed deprecations. + config.active_support.disallowed_deprecation = :log + + # Tell Active Support which deprecation messages to disallow. + config.active_support.disallowed_deprecation_warnings = [] + # Use default logging formatter so that PID and timestamp are not suppressed. config.log_formatter = ::Logger::Formatter.new # Use a different logger for distributed setups. - # require 'syslog/logger' + # require "syslog/logger" # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') if ENV["RAILS_LOG_TO_STDOUT"].present? logger = ActiveSupport::Logger.new(STDOUT) logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) + config.logger = ActiveSupport::TaggedLogging.new(logger) end # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session + # SMTP / Email config. config.action_mailer.delivery_method = :smtp diff --git a/config/environments/test.rb b/config/environments/test.rb index 640cf79..89718d7 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,49 +1,63 @@ +require "active_support/core_ext/integer/time" + +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # The test environment is used exclusively to run your application's - # test suite. You never need to work with it otherwise. Remember that - # your test database is "scratch space" for the test suite and is wiped - # and recreated between test runs. Don't rely on the data there! config.cache_classes = true + config.action_view.cache_template_loading = true # Do not eager load code on boot. This avoids loading your whole application # just for the purpose of running a single test. If you are using a tool that # preloads Rails for running tests, you may have to set it to true. config.eager_load = false - # Enable CSRF Tokens per form - config.action_controller.per_form_csrf_tokens = true - config.action_controller.forgery_protection_origin_check = true - # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - 'Cache-Control' => 'public, max-age=3600' + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. config.consider_all_requests_local = true config.action_controller.perform_caching = false + config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. config.action_dispatch.show_exceptions = false # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false - config.action_mailer.perform_caching = true + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - config.action_mailer.default_options = {from: 'SecretLink.org Sharing '} - config.action_mailer.default_url_options = { :host => "localhost", :port => 3000 } # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr - # Raises error for missing translations - # config.action_view.raise_on_missing_translations = true + # Raise exceptions for disallowed deprecations. + config.active_support.disallowed_deprecation = :raise + + # Tell Active Support which deprecation messages to disallow. + config.active_support.disallowed_deprecation_warnings = [] + + config.action_mailer.default_options = {from: 'SecretLink.org Sharing '} + config.action_mailer.default_url_options = { :host => "localhost", :port => 3000 } + + # Raises error for missing translations. + # config.i18n.raise_on_missing_translations = true + + # Annotate rendered view with file names. + # config.action_view.annotate_rendered_view_with_filenames = true end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb index 51639b6..89d2efa 100644 --- a/config/initializers/application_controller_renderer.rb +++ b/config/initializers/application_controller_renderer.rb @@ -1,6 +1,8 @@ # Be sure to restart your server when you modify this file. -# ApplicationController.renderer.defaults.merge!( -# http_host: 'example.org', -# https: false -# ) +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 01402af..826a209 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -3,11 +3,12 @@ # Version of your assets, change this if you want to expire all your assets. Rails.application.config.assets.version = '1.0' -# Add additional assets to the asset load path +# Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path # Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += %w( search.js ) +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) -Rails.application.config.assets.precompile += %w( homepage-icons ) \ No newline at end of file +Rails.application.config.assets.precompile += %w( homepage-icons ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index 59385cd..33699c3 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -1,7 +1,8 @@ # Be sure to restart your server when you modify this file. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } +# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) } -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code +# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'". +Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"] diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000..41c4301 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,28 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Set the nonce only to specific directives +# Rails.application.config.content_security_policy_nonce_directives = %w(script-src) + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index 4a994e1..6a1041b 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -1,4 +1,6 @@ # Be sure to restart your server when you modify this file. # Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [:password] +Rails.application.config.filter_parameters += [ + :passw, :password, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn +] diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb index 3a1136b..3bbd47e 100644 --- a/config/initializers/new_framework_defaults.rb +++ b/config/initializers/new_framework_defaults.rb @@ -17,8 +17,5 @@ # Require `belongs_to` associations by default. Previous versions had false. Rails.application.config.active_record.belongs_to_required_by_default = true -# Do not halt callback chains when a callback returns false. Previous versions had true. -ActiveSupport.halt_callback_chains_on_return_false = false - # Configure SSL options to enable HSTS with subdomains. Previous versions had false. Rails.application.config.ssl_options = { hsts: { subdomains: true } } \ No newline at end of file diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb new file mode 100644 index 0000000..9526b83 --- /dev/null +++ b/config/initializers/new_framework_defaults_6_1.rb @@ -0,0 +1,67 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 6.1 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Support for inversing belongs_to -> has_many Active Record associations. +# Rails.application.config.active_record.has_many_inversing = true + +# Track Active Storage variants in the database. +# Rails.application.config.active_storage.track_variants = true + +# Apply random variation to the delay when retrying failed jobs. +# Rails.application.config.active_job.retry_jitter = 0.15 + +# Stop executing `after_enqueue`/`after_perform` callbacks if +# `before_enqueue`/`before_perform` respectively halts with `throw :abort`. +# Rails.application.config.active_job.skip_after_callbacks_if_terminated = true + +# Specify cookies SameSite protection level: either :none, :lax, or :strict. +# +# This change is not backwards compatible with earlier Rails versions. +# It's best enabled when your entire app is migrated and stable on 6.1. +# Rails.application.config.action_dispatch.cookies_same_site_protection = :lax + +# Generate CSRF tokens that are encoded in URL-safe Base64. +# +# This change is not backwards compatible with earlier Rails versions. +# It's best enabled when your entire app is migrated and stable on 6.1. +# Rails.application.config.action_controller.urlsafe_csrf_tokens = true + +# Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an +# UTC offset or a UTC time. +# ActiveSupport.utc_to_local_returns_utc_offset_times = true + +# Change the default HTTP status code to `308` when redirecting non-GET/HEAD +# requests to HTTPS in `ActionDispatch::SSL` middleware. +# Rails.application.config.action_dispatch.ssl_default_redirect_status = 308 + +# Use new connection handling API. For most applications this won't have any +# effect. For applications using multiple databases, this new API provides +# support for granular connection swapping. +# Rails.application.config.active_record.legacy_connection_handling = false + +# Make `form_with` generate non-remote forms by default. +# Rails.application.config.action_view.form_with_generates_remote_forms = false + +# Set the default queue name for the analysis job to the queue adapter default. +# Rails.application.config.active_storage.queues.analysis = nil + +# Set the default queue name for the purge job to the queue adapter default. +# Rails.application.config.active_storage.queues.purge = nil + +# Set the default queue name for the incineration job to the queue adapter default. +# Rails.application.config.action_mailbox.queues.incineration = nil + +# Set the default queue name for the routing job to the queue adapter default. +# Rails.application.config.action_mailbox.queues.routing = nil + +# Set the default queue name for the mail deliver job to the queue adapter default. +# Rails.application.config.action_mailer.deliver_later_queue_name = nil + +# Generate a `Link` header that gives a hint to modern browsers about +# preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`. +# Rails.application.config.action_view.preload_links_header = true diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb new file mode 100644 index 0000000..00f64d7 --- /dev/null +++ b/config/initializers/permissions_policy.rb @@ -0,0 +1,11 @@ +# Define an application-wide HTTP permissions policy. For further +# information see https://developers.google.com/web/updates/2018/06/feature-policy +# +# Rails.application.config.permissions_policy do |f| +# f.camera :none +# f.gyroscope :none +# f.microphone :none +# f.usb :none +# f.fullscreen :self +# f.payment :self, "https://secure.example.com" +# end diff --git a/config/locales/en.yml b/config/locales/en.yml index 0653957..cf9b342 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,8 +16,18 @@ # # This would use the information in config/locales/es.yml. # +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# # To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. +# available at https://guides.rubyonrails.org/i18n.html. en: hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb index 1f3e915..d9b3e83 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,22 +1,31 @@ # Puma can serve each request in a thread from an internal thread pool. -# The `threads` method setting takes two numbers a minimum and maximum. +# The `threads` method setting takes two numbers: a minimum and maximum. # Any libraries that use thread pools should be configured to match # the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum, this matches the default thread size of Active Record. +# and maximum; this matches the default thread size of Active Record. # -threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i -threads threads_count, threads_count +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count -# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# Specifies the `worker_timeout` threshold that Puma will use to wait before +# terminating a worker in development environments. # -port ENV.fetch("PORT") { 3000 } +worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development" + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } # Specifies the `environment` that Puma will run in. # environment ENV.fetch("RAILS_ENV") { "development" } +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + # Specifies the number of `workers` to boot in clustered mode. -# Workers are forked webserver processes. If using threads and workers together +# Workers are forked web server processes. If using threads and workers together # the concurrency of the application would be max `threads` * `workers`. # Workers do not work on JRuby or Windows (both of which do not support # processes). @@ -26,22 +35,9 @@ # Use the `preload_app!` method when specifying a `workers` number. # This directive tells Puma to first boot the application and load code # before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. +# process behavior so workers use less memory. # # preload_app! -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted this block will be run, if you are using `preload_app!` -# option you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end - # Allow puma to be restarted by `rails restart` command. -plugin :tmp_restart \ No newline at end of file +plugin :tmp_restart diff --git a/config/spring.rb b/config/spring.rb index c9119b4..db5bf13 100644 --- a/config/spring.rb +++ b/config/spring.rb @@ -1,6 +1,6 @@ -%w( - .ruby-version - .rbenv-vars - tmp/restart.txt - tmp/caching-dev.txt -).each { |path| Spring.watch(path) } +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000..d32f76e --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/config/unicorn.rb b/config/unicorn.rb new file mode 100644 index 0000000..f6e59b8 --- /dev/null +++ b/config/unicorn.rb @@ -0,0 +1,22 @@ +worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3) +timeout 15 +preload_app true + +before_fork do |server, worker| + Signal.trap 'TERM' do + puts 'Unicorn master intercepting TERM and sending myself QUIT instead' + Process.kill 'QUIT', Process.pid + end + + defined?(ActiveRecord::Base) and + ActiveRecord::Base.connection.disconnect! +end + +after_fork do |server, worker| + Signal.trap 'TERM' do + puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT' + end + + defined?(ActiveRecord::Base) and + ActiveRecord::Base.establish_connection +end diff --git a/spec/models/secret_spec.rb b/spec/models/secret_spec.rb index c3f18af..1124041 100644 --- a/spec/models/secret_spec.rb +++ b/spec/models/secret_spec.rb @@ -13,12 +13,12 @@ end it 'is false if the expiry is in the future' do - secret.update_attributes(expire_at: Time.now + 2.days) + secret.update(expire_at: Time.now + 2.days) expect(secret.expired?).to be(false) end it 'is false if the expiry date is nil' do - secret.update_attributes(expire_at: nil) + secret.update(expire_at: nil) expect(secret.expired?).to be(false) end diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/vendor/cache/actioncable-5.0.7.2.gem b/vendor/cache/actioncable-5.0.7.2.gem deleted file mode 100644 index 2a56925..0000000 Binary files a/vendor/cache/actioncable-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-5.0.7.2.gem b/vendor/cache/actionmailer-5.0.7.2.gem deleted file mode 100644 index 5916141..0000000 Binary files a/vendor/cache/actionmailer-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/actionpack-5.0.7.2.gem b/vendor/cache/actionpack-5.0.7.2.gem deleted file mode 100644 index 87877f8..0000000 Binary files a/vendor/cache/actionpack-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/actionview-5.0.7.2.gem b/vendor/cache/actionview-5.0.7.2.gem deleted file mode 100644 index 72099a0..0000000 Binary files a/vendor/cache/actionview-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/activejob-5.0.7.2.gem b/vendor/cache/activejob-5.0.7.2.gem deleted file mode 100644 index 82fb537..0000000 Binary files a/vendor/cache/activejob-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/activemodel-5.0.7.2.gem b/vendor/cache/activemodel-5.0.7.2.gem deleted file mode 100644 index 334d277..0000000 Binary files a/vendor/cache/activemodel-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/activerecord-5.0.7.2.gem b/vendor/cache/activerecord-5.0.7.2.gem deleted file mode 100644 index 9a788ab..0000000 Binary files a/vendor/cache/activerecord-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/activesupport-5.0.7.2.gem b/vendor/cache/activesupport-5.0.7.2.gem deleted file mode 100644 index 6e160aa..0000000 Binary files a/vendor/cache/activesupport-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/addressable-2.8.1.gem b/vendor/cache/addressable-2.8.1.gem deleted file mode 100644 index 17e4257..0000000 Binary files a/vendor/cache/addressable-2.8.1.gem and /dev/null differ diff --git a/vendor/cache/arel-7.1.4.gem b/vendor/cache/arel-7.1.4.gem deleted file mode 100644 index 0298aa8..0000000 Binary files a/vendor/cache/arel-7.1.4.gem and /dev/null differ diff --git a/vendor/cache/ast-2.4.2.gem b/vendor/cache/ast-2.4.2.gem deleted file mode 100644 index abe1643..0000000 Binary files a/vendor/cache/ast-2.4.2.gem and /dev/null differ diff --git a/vendor/cache/attr_encrypted-3.1.0.gem b/vendor/cache/attr_encrypted-3.1.0.gem deleted file mode 100644 index 7ab5bc4..0000000 Binary files a/vendor/cache/attr_encrypted-3.1.0.gem and /dev/null differ diff --git a/vendor/cache/autoprefixer-rails-10.4.7.0.gem b/vendor/cache/autoprefixer-rails-10.4.7.0.gem deleted file mode 100644 index ed0137c..0000000 Binary files a/vendor/cache/autoprefixer-rails-10.4.7.0.gem and /dev/null differ diff --git a/vendor/cache/better_errors-2.9.1.gem b/vendor/cache/better_errors-2.9.1.gem deleted file mode 100644 index 2d6cdc2..0000000 Binary files a/vendor/cache/better_errors-2.9.1.gem and /dev/null differ diff --git a/vendor/cache/bindex-0.8.1.gem b/vendor/cache/bindex-0.8.1.gem deleted file mode 100644 index ebf48db..0000000 Binary files a/vendor/cache/bindex-0.8.1.gem and /dev/null differ diff --git a/vendor/cache/bootstrap-sass-3.3.7.gem b/vendor/cache/bootstrap-sass-3.3.7.gem deleted file mode 100644 index d17a313..0000000 Binary files a/vendor/cache/bootstrap-sass-3.3.7.gem and /dev/null differ diff --git a/vendor/cache/bootstrap-scss-0.0.3.gem b/vendor/cache/bootstrap-scss-0.0.3.gem deleted file mode 100644 index 2b5b8b5..0000000 Binary files a/vendor/cache/bootstrap-scss-0.0.3.gem and /dev/null differ diff --git a/vendor/cache/bugsnag-6.25.1.gem b/vendor/cache/bugsnag-6.25.1.gem deleted file mode 100644 index 4fdcd5a..0000000 Binary files a/vendor/cache/bugsnag-6.25.1.gem and /dev/null differ diff --git a/vendor/cache/builder-3.2.4.gem b/vendor/cache/builder-3.2.4.gem deleted file mode 100644 index b12407c..0000000 Binary files a/vendor/cache/builder-3.2.4.gem and /dev/null differ diff --git a/vendor/cache/byebug-11.1.3.gem b/vendor/cache/byebug-11.1.3.gem deleted file mode 100644 index 4321f4b..0000000 Binary files a/vendor/cache/byebug-11.1.3.gem and /dev/null differ diff --git a/vendor/cache/capybara-3.38.0.gem b/vendor/cache/capybara-3.38.0.gem deleted file mode 100644 index 3121eb7..0000000 Binary files a/vendor/cache/capybara-3.38.0.gem and /dev/null differ diff --git a/vendor/cache/capybara-selenium-0.0.6.gem b/vendor/cache/capybara-selenium-0.0.6.gem deleted file mode 100644 index 30f1703..0000000 Binary files a/vendor/cache/capybara-selenium-0.0.6.gem and /dev/null differ diff --git a/vendor/cache/carrierwave-2.2.3.gem b/vendor/cache/carrierwave-2.2.3.gem deleted file mode 100644 index 90bf65d..0000000 Binary files a/vendor/cache/carrierwave-2.2.3.gem and /dev/null differ diff --git a/vendor/cache/coderay-1.1.3.gem b/vendor/cache/coderay-1.1.3.gem deleted file mode 100644 index 3475820..0000000 Binary files a/vendor/cache/coderay-1.1.3.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.1.10.gem b/vendor/cache/concurrent-ruby-1.1.10.gem deleted file mode 100644 index c796701..0000000 Binary files a/vendor/cache/concurrent-ruby-1.1.10.gem and /dev/null differ diff --git a/vendor/cache/crass-1.0.6.gem b/vendor/cache/crass-1.0.6.gem deleted file mode 100644 index 7128f38..0000000 Binary files a/vendor/cache/crass-1.0.6.gem and /dev/null differ diff --git a/vendor/cache/database_cleaner-2.0.1.gem b/vendor/cache/database_cleaner-2.0.1.gem deleted file mode 100644 index 42c0667..0000000 Binary files a/vendor/cache/database_cleaner-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/database_cleaner-active_record-2.0.1.gem b/vendor/cache/database_cleaner-active_record-2.0.1.gem deleted file mode 100644 index c1ed4b4..0000000 Binary files a/vendor/cache/database_cleaner-active_record-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/database_cleaner-core-2.0.1.gem b/vendor/cache/database_cleaner-core-2.0.1.gem deleted file mode 100644 index d49376e..0000000 Binary files a/vendor/cache/database_cleaner-core-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/date-3.3.3.gem b/vendor/cache/date-3.3.3.gem deleted file mode 100644 index d4bc123..0000000 Binary files a/vendor/cache/date-3.3.3.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.5.0.gem b/vendor/cache/diff-lcs-1.5.0.gem deleted file mode 100644 index 3a25852..0000000 Binary files a/vendor/cache/diff-lcs-1.5.0.gem and /dev/null differ diff --git a/vendor/cache/dotenv-2.8.1.gem b/vendor/cache/dotenv-2.8.1.gem deleted file mode 100644 index 1e95207..0000000 Binary files a/vendor/cache/dotenv-2.8.1.gem and /dev/null differ diff --git a/vendor/cache/dotenv-rails-2.8.1.gem b/vendor/cache/dotenv-rails-2.8.1.gem deleted file mode 100644 index 1aab6b4..0000000 Binary files a/vendor/cache/dotenv-rails-2.8.1.gem and /dev/null differ diff --git a/vendor/cache/email_validator-2.2.4.gem b/vendor/cache/email_validator-2.2.4.gem deleted file mode 100644 index 8c4df6c..0000000 Binary files a/vendor/cache/email_validator-2.2.4.gem and /dev/null differ diff --git a/vendor/cache/encryptor-3.0.0.gem b/vendor/cache/encryptor-3.0.0.gem deleted file mode 100644 index e026ddf..0000000 Binary files a/vendor/cache/encryptor-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/erubi-1.12.0.gem b/vendor/cache/erubi-1.12.0.gem deleted file mode 100644 index 480dbd4..0000000 Binary files a/vendor/cache/erubi-1.12.0.gem and /dev/null differ diff --git a/vendor/cache/erubis-2.7.0.gem b/vendor/cache/erubis-2.7.0.gem deleted file mode 100644 index 4acd2e7..0000000 Binary files a/vendor/cache/erubis-2.7.0.gem and /dev/null differ diff --git a/vendor/cache/execjs-2.8.1.gem b/vendor/cache/execjs-2.8.1.gem deleted file mode 100644 index b8c2d2f..0000000 Binary files a/vendor/cache/execjs-2.8.1.gem and /dev/null differ diff --git a/vendor/cache/factory_girl-4.9.0.gem b/vendor/cache/factory_girl-4.9.0.gem deleted file mode 100644 index 7b55c34..0000000 Binary files a/vendor/cache/factory_girl-4.9.0.gem and /dev/null differ diff --git a/vendor/cache/factory_girl_rails-4.9.0.gem b/vendor/cache/factory_girl_rails-4.9.0.gem deleted file mode 100644 index 94252a5..0000000 Binary files a/vendor/cache/factory_girl_rails-4.9.0.gem and /dev/null differ diff --git a/vendor/cache/faker-3.1.0.gem b/vendor/cache/faker-3.1.0.gem deleted file mode 100644 index 0077200..0000000 Binary files a/vendor/cache/faker-3.1.0.gem and /dev/null differ diff --git a/vendor/cache/faraday-2.7.3.gem b/vendor/cache/faraday-2.7.3.gem deleted file mode 100644 index 578a4ea..0000000 Binary files a/vendor/cache/faraday-2.7.3.gem and /dev/null differ diff --git a/vendor/cache/faraday-net_http-3.0.2.gem b/vendor/cache/faraday-net_http-3.0.2.gem deleted file mode 100644 index f6b5175..0000000 Binary files a/vendor/cache/faraday-net_http-3.0.2.gem and /dev/null differ diff --git a/vendor/cache/ffi-1.15.5.gem b/vendor/cache/ffi-1.15.5.gem deleted file mode 100644 index a632047..0000000 Binary files a/vendor/cache/ffi-1.15.5.gem and /dev/null differ diff --git a/vendor/cache/globalid-1.0.1.gem b/vendor/cache/globalid-1.0.1.gem deleted file mode 100644 index f98bac0..0000000 Binary files a/vendor/cache/globalid-1.0.1.gem and /dev/null differ diff --git a/vendor/cache/hashie-5.0.0.gem b/vendor/cache/hashie-5.0.0.gem deleted file mode 100644 index ae9aae4..0000000 Binary files a/vendor/cache/hashie-5.0.0.gem and /dev/null differ diff --git a/vendor/cache/i18n-1.12.0.gem b/vendor/cache/i18n-1.12.0.gem deleted file mode 100644 index c64c068..0000000 Binary files a/vendor/cache/i18n-1.12.0.gem and /dev/null differ diff --git a/vendor/cache/image_processing-1.12.2.gem b/vendor/cache/image_processing-1.12.2.gem deleted file mode 100644 index 08a4cec..0000000 Binary files a/vendor/cache/image_processing-1.12.2.gem and /dev/null differ diff --git a/vendor/cache/jbuilder-2.11.5.gem b/vendor/cache/jbuilder-2.11.5.gem deleted file mode 100644 index db7de78..0000000 Binary files a/vendor/cache/jbuilder-2.11.5.gem and /dev/null differ diff --git a/vendor/cache/jquery-rails-4.5.1.gem b/vendor/cache/jquery-rails-4.5.1.gem deleted file mode 100644 index af0ab29..0000000 Binary files a/vendor/cache/jquery-rails-4.5.1.gem and /dev/null differ diff --git a/vendor/cache/json-1.8.6.gem b/vendor/cache/json-1.8.6.gem deleted file mode 100644 index 2a7d664..0000000 Binary files a/vendor/cache/json-1.8.6.gem and /dev/null differ diff --git a/vendor/cache/jwt-2.6.0.gem b/vendor/cache/jwt-2.6.0.gem deleted file mode 100644 index 21836de..0000000 Binary files a/vendor/cache/jwt-2.6.0.gem and /dev/null differ diff --git a/vendor/cache/launchy-2.5.2.gem b/vendor/cache/launchy-2.5.2.gem deleted file mode 100644 index 5ae7b2a..0000000 Binary files a/vendor/cache/launchy-2.5.2.gem and /dev/null differ diff --git a/vendor/cache/listen-3.0.8.gem b/vendor/cache/listen-3.0.8.gem deleted file mode 100644 index 34fb00a..0000000 Binary files a/vendor/cache/listen-3.0.8.gem and /dev/null differ diff --git a/vendor/cache/logstash-event-1.2.02.gem b/vendor/cache/logstash-event-1.2.02.gem deleted file mode 100644 index 0eaea6c..0000000 Binary files a/vendor/cache/logstash-event-1.2.02.gem and /dev/null differ diff --git a/vendor/cache/logstasher-0.6.5.gem b/vendor/cache/logstasher-0.6.5.gem deleted file mode 100644 index d467768..0000000 Binary files a/vendor/cache/logstasher-0.6.5.gem and /dev/null differ diff --git a/vendor/cache/loofah-2.19.1.gem b/vendor/cache/loofah-2.19.1.gem deleted file mode 100644 index 9ac4d59..0000000 Binary files a/vendor/cache/loofah-2.19.1.gem and /dev/null differ diff --git a/vendor/cache/mail-2.8.0.1.gem b/vendor/cache/mail-2.8.0.1.gem deleted file mode 100644 index a150f2d..0000000 Binary files a/vendor/cache/mail-2.8.0.1.gem and /dev/null differ diff --git a/vendor/cache/marcel-1.0.2.gem b/vendor/cache/marcel-1.0.2.gem deleted file mode 100644 index acb69eb..0000000 Binary files a/vendor/cache/marcel-1.0.2.gem and /dev/null differ diff --git a/vendor/cache/matrix-0.4.2.gem b/vendor/cache/matrix-0.4.2.gem deleted file mode 100644 index 11cb572..0000000 Binary files a/vendor/cache/matrix-0.4.2.gem and /dev/null differ diff --git a/vendor/cache/method_source-1.0.0.gem b/vendor/cache/method_source-1.0.0.gem deleted file mode 100644 index 2e035c3..0000000 Binary files a/vendor/cache/method_source-1.0.0.gem and /dev/null differ diff --git a/vendor/cache/mini_magick-4.12.0.gem b/vendor/cache/mini_magick-4.12.0.gem deleted file mode 100644 index f4eefc7..0000000 Binary files a/vendor/cache/mini_magick-4.12.0.gem and /dev/null differ diff --git a/vendor/cache/mini_mime-1.1.2.gem b/vendor/cache/mini_mime-1.1.2.gem deleted file mode 100644 index 6e79465..0000000 Binary files a/vendor/cache/mini_mime-1.1.2.gem and /dev/null differ diff --git a/vendor/cache/mini_portile2-2.8.1.gem b/vendor/cache/mini_portile2-2.8.1.gem deleted file mode 100644 index 277e0eb..0000000 Binary files a/vendor/cache/mini_portile2-2.8.1.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.17.0.gem b/vendor/cache/minitest-5.17.0.gem deleted file mode 100644 index 11416f6..0000000 Binary files a/vendor/cache/minitest-5.17.0.gem and /dev/null differ diff --git a/vendor/cache/multi_xml-0.6.0.gem b/vendor/cache/multi_xml-0.6.0.gem deleted file mode 100644 index 77c5d00..0000000 Binary files a/vendor/cache/multi_xml-0.6.0.gem and /dev/null differ diff --git a/vendor/cache/net-imap-0.3.4.gem b/vendor/cache/net-imap-0.3.4.gem deleted file mode 100644 index b129422..0000000 Binary files a/vendor/cache/net-imap-0.3.4.gem and /dev/null differ diff --git a/vendor/cache/net-pop-0.1.2.gem b/vendor/cache/net-pop-0.1.2.gem deleted file mode 100644 index 98bcdb7..0000000 Binary files a/vendor/cache/net-pop-0.1.2.gem and /dev/null differ diff --git a/vendor/cache/net-protocol-0.2.1.gem b/vendor/cache/net-protocol-0.2.1.gem deleted file mode 100644 index 60b8794..0000000 Binary files a/vendor/cache/net-protocol-0.2.1.gem and /dev/null differ diff --git a/vendor/cache/net-smtp-0.3.3.gem b/vendor/cache/net-smtp-0.3.3.gem deleted file mode 100644 index 09fd408..0000000 Binary files a/vendor/cache/net-smtp-0.3.3.gem and /dev/null differ diff --git a/vendor/cache/nio4r-2.5.8.gem b/vendor/cache/nio4r-2.5.8.gem deleted file mode 100644 index f116b6f..0000000 Binary files a/vendor/cache/nio4r-2.5.8.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.14.0-arm64-darwin.gem b/vendor/cache/nokogiri-1.14.0-arm64-darwin.gem deleted file mode 100644 index 814bf62..0000000 Binary files a/vendor/cache/nokogiri-1.14.0-arm64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.14.0.gem b/vendor/cache/nokogiri-1.14.0.gem deleted file mode 100644 index 74b3dd2..0000000 Binary files a/vendor/cache/nokogiri-1.14.0.gem and /dev/null differ diff --git a/vendor/cache/oauth2-2.0.9.gem b/vendor/cache/oauth2-2.0.9.gem deleted file mode 100644 index f875e11..0000000 Binary files a/vendor/cache/oauth2-2.0.9.gem and /dev/null differ diff --git a/vendor/cache/okcomputer-1.18.4.gem b/vendor/cache/okcomputer-1.18.4.gem deleted file mode 100644 index 831969d..0000000 Binary files a/vendor/cache/okcomputer-1.18.4.gem and /dev/null differ diff --git a/vendor/cache/omniauth-2.1.0.gem b/vendor/cache/omniauth-2.1.0.gem deleted file mode 100644 index 5d8c445..0000000 Binary files a/vendor/cache/omniauth-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/omniauth-google-oauth2-1.1.1.gem b/vendor/cache/omniauth-google-oauth2-1.1.1.gem deleted file mode 100644 index 9c59eb6..0000000 Binary files a/vendor/cache/omniauth-google-oauth2-1.1.1.gem and /dev/null differ diff --git a/vendor/cache/omniauth-oauth2-1.8.0.gem b/vendor/cache/omniauth-oauth2-1.8.0.gem deleted file mode 100644 index 3e58a53..0000000 Binary files a/vendor/cache/omniauth-oauth2-1.8.0.gem and /dev/null differ diff --git a/vendor/cache/parallel-1.22.1.gem b/vendor/cache/parallel-1.22.1.gem deleted file mode 100644 index 5208c79..0000000 Binary files a/vendor/cache/parallel-1.22.1.gem and /dev/null differ diff --git a/vendor/cache/parser-3.2.0.0.gem b/vendor/cache/parser-3.2.0.0.gem deleted file mode 100644 index 105a202..0000000 Binary files a/vendor/cache/parser-3.2.0.0.gem and /dev/null differ diff --git a/vendor/cache/pg-1.4.5.gem b/vendor/cache/pg-1.4.5.gem deleted file mode 100644 index a7b603c..0000000 Binary files a/vendor/cache/pg-1.4.5.gem and /dev/null differ diff --git a/vendor/cache/pickadate-rails-3.5.6.0.gem b/vendor/cache/pickadate-rails-3.5.6.0.gem deleted file mode 100644 index 07a22e8..0000000 Binary files a/vendor/cache/pickadate-rails-3.5.6.0.gem and /dev/null differ diff --git a/vendor/cache/public_suffix-5.0.1.gem b/vendor/cache/public_suffix-5.0.1.gem deleted file mode 100644 index 853a534..0000000 Binary files a/vendor/cache/public_suffix-5.0.1.gem and /dev/null differ diff --git a/vendor/cache/puma-3.12.6.gem b/vendor/cache/puma-3.12.6.gem deleted file mode 100644 index 64d2a5b..0000000 Binary files a/vendor/cache/puma-3.12.6.gem and /dev/null differ diff --git a/vendor/cache/racc-1.6.2.gem b/vendor/cache/racc-1.6.2.gem deleted file mode 100644 index 5e8cdad..0000000 Binary files a/vendor/cache/racc-1.6.2.gem and /dev/null differ diff --git a/vendor/cache/rack-2.2.6.2.gem b/vendor/cache/rack-2.2.6.2.gem deleted file mode 100644 index 207050f..0000000 Binary files a/vendor/cache/rack-2.2.6.2.gem and /dev/null differ diff --git a/vendor/cache/rack-protection-3.0.5.gem b/vendor/cache/rack-protection-3.0.5.gem deleted file mode 100644 index 32f3714..0000000 Binary files a/vendor/cache/rack-protection-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/rack-test-0.6.3.gem b/vendor/cache/rack-test-0.6.3.gem deleted file mode 100644 index 914afe9..0000000 Binary files a/vendor/cache/rack-test-0.6.3.gem and /dev/null differ diff --git a/vendor/cache/rails-5.0.7.2.gem b/vendor/cache/rails-5.0.7.2.gem deleted file mode 100644 index a48d5eb..0000000 Binary files a/vendor/cache/rails-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/rails-dom-testing-2.0.3.gem b/vendor/cache/rails-dom-testing-2.0.3.gem deleted file mode 100644 index f311130..0000000 Binary files a/vendor/cache/rails-dom-testing-2.0.3.gem and /dev/null differ diff --git a/vendor/cache/rails-html-sanitizer-1.4.4.gem b/vendor/cache/rails-html-sanitizer-1.4.4.gem deleted file mode 100644 index 22bb956..0000000 Binary files a/vendor/cache/rails-html-sanitizer-1.4.4.gem and /dev/null differ diff --git a/vendor/cache/rails_12factor-0.0.3.gem b/vendor/cache/rails_12factor-0.0.3.gem deleted file mode 100644 index 26b17bf..0000000 Binary files a/vendor/cache/rails_12factor-0.0.3.gem and /dev/null differ diff --git a/vendor/cache/rails_serve_static_assets-0.0.5.gem b/vendor/cache/rails_serve_static_assets-0.0.5.gem deleted file mode 100644 index dfe349c..0000000 Binary files a/vendor/cache/rails_serve_static_assets-0.0.5.gem and /dev/null differ diff --git a/vendor/cache/rails_stdout_logging-0.0.5.gem b/vendor/cache/rails_stdout_logging-0.0.5.gem deleted file mode 100644 index f09bc21..0000000 Binary files a/vendor/cache/rails_stdout_logging-0.0.5.gem and /dev/null differ diff --git a/vendor/cache/railties-5.0.7.2.gem b/vendor/cache/railties-5.0.7.2.gem deleted file mode 100644 index 7c60750..0000000 Binary files a/vendor/cache/railties-5.0.7.2.gem and /dev/null differ diff --git a/vendor/cache/rainbow-3.1.1.gem b/vendor/cache/rainbow-3.1.1.gem deleted file mode 100644 index 863181a..0000000 Binary files a/vendor/cache/rainbow-3.1.1.gem and /dev/null differ diff --git a/vendor/cache/rake-13.0.6.gem b/vendor/cache/rake-13.0.6.gem deleted file mode 100644 index 19ae802..0000000 Binary files a/vendor/cache/rake-13.0.6.gem and /dev/null differ diff --git a/vendor/cache/rb-fsevent-0.11.2.gem b/vendor/cache/rb-fsevent-0.11.2.gem deleted file mode 100644 index e645266..0000000 Binary files a/vendor/cache/rb-fsevent-0.11.2.gem and /dev/null differ diff --git a/vendor/cache/rb-inotify-0.10.1.gem b/vendor/cache/rb-inotify-0.10.1.gem deleted file mode 100644 index 276590b..0000000 Binary files a/vendor/cache/rb-inotify-0.10.1.gem and /dev/null differ diff --git a/vendor/cache/rdoc-4.3.0.gem b/vendor/cache/rdoc-4.3.0.gem deleted file mode 100644 index 0c1239f..0000000 Binary files a/vendor/cache/rdoc-4.3.0.gem and /dev/null differ diff --git a/vendor/cache/recaptcha-5.12.3.gem b/vendor/cache/recaptcha-5.12.3.gem deleted file mode 100644 index 3f64b5a..0000000 Binary files a/vendor/cache/recaptcha-5.12.3.gem and /dev/null differ diff --git a/vendor/cache/regexp_parser-2.6.2.gem b/vendor/cache/regexp_parser-2.6.2.gem deleted file mode 100644 index 3b88462..0000000 Binary files a/vendor/cache/regexp_parser-2.6.2.gem and /dev/null differ diff --git a/vendor/cache/request_store-1.5.1.gem b/vendor/cache/request_store-1.5.1.gem deleted file mode 100644 index 9a6be28..0000000 Binary files a/vendor/cache/request_store-1.5.1.gem and /dev/null differ diff --git a/vendor/cache/rexml-3.2.5.gem b/vendor/cache/rexml-3.2.5.gem deleted file mode 100644 index 5680fec..0000000 Binary files a/vendor/cache/rexml-3.2.5.gem and /dev/null differ diff --git a/vendor/cache/rspec-core-3.12.0.gem b/vendor/cache/rspec-core-3.12.0.gem deleted file mode 100644 index f774c2c..0000000 Binary files a/vendor/cache/rspec-core-3.12.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-expectations-3.12.2.gem b/vendor/cache/rspec-expectations-3.12.2.gem deleted file mode 100644 index f1ce318..0000000 Binary files a/vendor/cache/rspec-expectations-3.12.2.gem and /dev/null differ diff --git a/vendor/cache/rspec-mocks-3.12.3.gem b/vendor/cache/rspec-mocks-3.12.3.gem deleted file mode 100644 index 9fd1a23..0000000 Binary files a/vendor/cache/rspec-mocks-3.12.3.gem and /dev/null differ diff --git a/vendor/cache/rspec-rails-4.1.2.gem b/vendor/cache/rspec-rails-4.1.2.gem deleted file mode 100644 index ff19107..0000000 Binary files a/vendor/cache/rspec-rails-4.1.2.gem and /dev/null differ diff --git a/vendor/cache/rspec-support-3.12.0.gem b/vendor/cache/rspec-support-3.12.0.gem deleted file mode 100644 index 1902af6..0000000 Binary files a/vendor/cache/rspec-support-3.12.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-1.31.0.gem b/vendor/cache/rubocop-1.31.0.gem deleted file mode 100644 index a48dc3b..0000000 Binary files a/vendor/cache/rubocop-1.31.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-ast-1.24.1.gem b/vendor/cache/rubocop-ast-1.24.1.gem deleted file mode 100644 index a6fe2b4..0000000 Binary files a/vendor/cache/rubocop-ast-1.24.1.gem and /dev/null differ diff --git a/vendor/cache/ruby-progressbar-1.11.0.gem b/vendor/cache/ruby-progressbar-1.11.0.gem deleted file mode 100644 index a9d84e5..0000000 Binary files a/vendor/cache/ruby-progressbar-1.11.0.gem and /dev/null differ diff --git a/vendor/cache/ruby-vips-2.1.4.gem b/vendor/cache/ruby-vips-2.1.4.gem deleted file mode 100644 index 6389070..0000000 Binary files a/vendor/cache/ruby-vips-2.1.4.gem and /dev/null differ diff --git a/vendor/cache/ruby2_keywords-0.0.5.gem b/vendor/cache/ruby2_keywords-0.0.5.gem deleted file mode 100644 index d311c5d..0000000 Binary files a/vendor/cache/ruby2_keywords-0.0.5.gem and /dev/null differ diff --git a/vendor/cache/rubyzip-2.3.2.gem b/vendor/cache/rubyzip-2.3.2.gem deleted file mode 100644 index 36fdea6..0000000 Binary files a/vendor/cache/rubyzip-2.3.2.gem and /dev/null differ diff --git a/vendor/cache/sass-3.7.4.gem b/vendor/cache/sass-3.7.4.gem deleted file mode 100644 index b48c3b8..0000000 Binary files a/vendor/cache/sass-3.7.4.gem and /dev/null differ diff --git a/vendor/cache/sass-listen-4.0.0.gem b/vendor/cache/sass-listen-4.0.0.gem deleted file mode 100644 index 9464653..0000000 Binary files a/vendor/cache/sass-listen-4.0.0.gem and /dev/null differ diff --git a/vendor/cache/sassc-2.4.0.gem b/vendor/cache/sassc-2.4.0.gem deleted file mode 100644 index a8e2e1f..0000000 Binary files a/vendor/cache/sassc-2.4.0.gem and /dev/null differ diff --git a/vendor/cache/sassc-rails-2.1.2.gem b/vendor/cache/sassc-rails-2.1.2.gem deleted file mode 100644 index a599113..0000000 Binary files a/vendor/cache/sassc-rails-2.1.2.gem and /dev/null differ diff --git a/vendor/cache/sdoc-0.4.2.gem b/vendor/cache/sdoc-0.4.2.gem deleted file mode 100644 index 9454925..0000000 Binary files a/vendor/cache/sdoc-0.4.2.gem and /dev/null differ diff --git a/vendor/cache/selenium-webdriver-4.7.1.gem b/vendor/cache/selenium-webdriver-4.7.1.gem deleted file mode 100644 index 309e327..0000000 Binary files a/vendor/cache/selenium-webdriver-4.7.1.gem and /dev/null differ diff --git a/vendor/cache/show_me_the_cookies-5.0.1.gem b/vendor/cache/show_me_the_cookies-5.0.1.gem deleted file mode 100644 index f6fbdb7..0000000 Binary files a/vendor/cache/show_me_the_cookies-5.0.1.gem and /dev/null differ diff --git a/vendor/cache/simple_form-5.0.3.gem b/vendor/cache/simple_form-5.0.3.gem deleted file mode 100644 index a099117..0000000 Binary files a/vendor/cache/simple_form-5.0.3.gem and /dev/null differ diff --git a/vendor/cache/skylight-4.3.2.gem b/vendor/cache/skylight-4.3.2.gem deleted file mode 100644 index b93debf..0000000 Binary files a/vendor/cache/skylight-4.3.2.gem and /dev/null differ diff --git a/vendor/cache/skylight-core-4.3.2.gem b/vendor/cache/skylight-core-4.3.2.gem deleted file mode 100644 index 3bf57ce..0000000 Binary files a/vendor/cache/skylight-core-4.3.2.gem and /dev/null differ diff --git a/vendor/cache/snaky_hash-2.0.1.gem b/vendor/cache/snaky_hash-2.0.1.gem deleted file mode 100644 index 7f75a85..0000000 Binary files a/vendor/cache/snaky_hash-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/spring-2.1.1.gem b/vendor/cache/spring-2.1.1.gem deleted file mode 100644 index 638f226..0000000 Binary files a/vendor/cache/spring-2.1.1.gem and /dev/null differ diff --git a/vendor/cache/spring-watcher-listen-2.0.1.gem b/vendor/cache/spring-watcher-listen-2.0.1.gem deleted file mode 100644 index aabf22c..0000000 Binary files a/vendor/cache/spring-watcher-listen-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/sprockets-4.2.0.gem b/vendor/cache/sprockets-4.2.0.gem deleted file mode 100644 index efc0662..0000000 Binary files a/vendor/cache/sprockets-4.2.0.gem and /dev/null differ diff --git a/vendor/cache/sprockets-rails-3.2.2.gem b/vendor/cache/sprockets-rails-3.2.2.gem deleted file mode 100644 index 8d2c00b..0000000 Binary files a/vendor/cache/sprockets-rails-3.2.2.gem and /dev/null differ diff --git a/vendor/cache/ssrf_filter-1.1.1.gem b/vendor/cache/ssrf_filter-1.1.1.gem deleted file mode 100644 index c629dcd..0000000 Binary files a/vendor/cache/ssrf_filter-1.1.1.gem and /dev/null differ diff --git a/vendor/cache/thor-1.2.1.gem b/vendor/cache/thor-1.2.1.gem deleted file mode 100644 index d7e14e1..0000000 Binary files a/vendor/cache/thor-1.2.1.gem and /dev/null differ diff --git a/vendor/cache/thread_safe-0.3.6.gem b/vendor/cache/thread_safe-0.3.6.gem deleted file mode 100644 index 7ee950f..0000000 Binary files a/vendor/cache/thread_safe-0.3.6.gem and /dev/null differ diff --git a/vendor/cache/tilt-2.0.11.gem b/vendor/cache/tilt-2.0.11.gem deleted file mode 100644 index fe1fe51..0000000 Binary files a/vendor/cache/tilt-2.0.11.gem and /dev/null differ diff --git a/vendor/cache/timecop-0.9.6.gem b/vendor/cache/timecop-0.9.6.gem deleted file mode 100644 index 46a1eb6..0000000 Binary files a/vendor/cache/timecop-0.9.6.gem and /dev/null differ diff --git a/vendor/cache/timeout-0.3.1.gem b/vendor/cache/timeout-0.3.1.gem deleted file mode 100644 index 95369eb..0000000 Binary files a/vendor/cache/timeout-0.3.1.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-1.2.10.gem b/vendor/cache/tzinfo-1.2.10.gem deleted file mode 100644 index 060998e..0000000 Binary files a/vendor/cache/tzinfo-1.2.10.gem and /dev/null differ diff --git a/vendor/cache/uglifier-4.2.0.gem b/vendor/cache/uglifier-4.2.0.gem deleted file mode 100644 index 9b97e3c..0000000 Binary files a/vendor/cache/uglifier-4.2.0.gem and /dev/null differ diff --git a/vendor/cache/unicode-display_width-2.4.2.gem b/vendor/cache/unicode-display_width-2.4.2.gem deleted file mode 100644 index 4402c5d..0000000 Binary files a/vendor/cache/unicode-display_width-2.4.2.gem and /dev/null differ diff --git a/vendor/cache/version_gem-1.1.1.gem b/vendor/cache/version_gem-1.1.1.gem deleted file mode 100644 index 7430b4e..0000000 Binary files a/vendor/cache/version_gem-1.1.1.gem and /dev/null differ diff --git a/vendor/cache/web-console-3.7.0.gem b/vendor/cache/web-console-3.7.0.gem deleted file mode 100644 index 82e5bde..0000000 Binary files a/vendor/cache/web-console-3.7.0.gem and /dev/null differ diff --git a/vendor/cache/websocket-1.2.9.gem b/vendor/cache/websocket-1.2.9.gem deleted file mode 100644 index 2578fac..0000000 Binary files a/vendor/cache/websocket-1.2.9.gem and /dev/null differ diff --git a/vendor/cache/websocket-driver-0.6.5.gem b/vendor/cache/websocket-driver-0.6.5.gem deleted file mode 100644 index e3a0776..0000000 Binary files a/vendor/cache/websocket-driver-0.6.5.gem and /dev/null differ diff --git a/vendor/cache/websocket-extensions-0.1.5.gem b/vendor/cache/websocket-extensions-0.1.5.gem deleted file mode 100644 index 6982244..0000000 Binary files a/vendor/cache/websocket-extensions-0.1.5.gem and /dev/null differ diff --git a/vendor/cache/xpath-3.2.0.gem b/vendor/cache/xpath-3.2.0.gem deleted file mode 100644 index 734ed7d..0000000 Binary files a/vendor/cache/xpath-3.2.0.gem and /dev/null differ