Upgrade to Rails 6.1 and apply new framework defaults
This commit is contained in:
3
Gemfile
3
Gemfile
@ -25,8 +25,7 @@ gem 'prometheus_exporter'
|
|||||||
gem 'pry-byebug'
|
gem 'pry-byebug'
|
||||||
gem 'puma'
|
gem 'puma'
|
||||||
gem 'pundit'
|
gem 'pundit'
|
||||||
# Switch to a newer 6.0 release while 6.0.3.7 is the newest version with the CSRF bug
|
gem 'rails', '~> 6.1.0'
|
||||||
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
|
|
||||||
gem 'rails_admin'
|
gem 'rails_admin'
|
||||||
gem 'rails-i18n'
|
gem 'rails-i18n'
|
||||||
gem 'rails-timeago'
|
gem 'rails-timeago'
|
||||||
|
171
Gemfile.lock
171
Gemfile.lock
@ -18,96 +18,73 @@ GIT
|
|||||||
nokogiri (>= 1.10.2, < 1.12.0)
|
nokogiri (>= 1.10.2, < 1.12.0)
|
||||||
rubyzip (>= 1.2.2, < 2.4.0)
|
rubyzip (>= 1.2.2, < 2.4.0)
|
||||||
|
|
||||||
GIT
|
|
||||||
remote: https://github.com/rails/rails
|
|
||||||
revision: ef97441036e0ebbe1aa2108d59c408707f998ffd
|
|
||||||
branch: 6-0-stable
|
|
||||||
specs:
|
|
||||||
actioncable (6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
nio4r (~> 2.0)
|
|
||||||
websocket-driver (>= 0.6.1)
|
|
||||||
actionmailbox (6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
activejob (= 6.0.3.7)
|
|
||||||
activerecord (= 6.0.3.7)
|
|
||||||
activestorage (= 6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
mail (>= 2.7.1)
|
|
||||||
actionmailer (6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
actionview (= 6.0.3.7)
|
|
||||||
activejob (= 6.0.3.7)
|
|
||||||
mail (~> 2.5, >= 2.5.4)
|
|
||||||
rails-dom-testing (~> 2.0)
|
|
||||||
actionpack (6.0.3.7)
|
|
||||||
actionview (= 6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
rack (~> 2.0, >= 2.0.8)
|
|
||||||
rack-test (>= 0.6.3)
|
|
||||||
rails-dom-testing (~> 2.0)
|
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
|
||||||
actiontext (6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
activerecord (= 6.0.3.7)
|
|
||||||
activestorage (= 6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
nokogiri (>= 1.8.5)
|
|
||||||
actionview (6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
builder (~> 3.1)
|
|
||||||
erubi (~> 1.4)
|
|
||||||
rails-dom-testing (~> 2.0)
|
|
||||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
|
||||||
activejob (6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
globalid (>= 0.3.6)
|
|
||||||
activemodel (6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
activerecord (6.0.3.7)
|
|
||||||
activemodel (= 6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
activestorage (6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
activejob (= 6.0.3.7)
|
|
||||||
activerecord (= 6.0.3.7)
|
|
||||||
marcel (~> 1.0.0)
|
|
||||||
activesupport (6.0.3.7)
|
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
||||||
i18n (>= 0.7, < 2)
|
|
||||||
minitest (~> 5.1)
|
|
||||||
tzinfo (~> 1.1)
|
|
||||||
zeitwerk (~> 2.2, >= 2.2.2)
|
|
||||||
rails (6.0.3.7)
|
|
||||||
actioncable (= 6.0.3.7)
|
|
||||||
actionmailbox (= 6.0.3.7)
|
|
||||||
actionmailer (= 6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
actiontext (= 6.0.3.7)
|
|
||||||
actionview (= 6.0.3.7)
|
|
||||||
activejob (= 6.0.3.7)
|
|
||||||
activemodel (= 6.0.3.7)
|
|
||||||
activerecord (= 6.0.3.7)
|
|
||||||
activestorage (= 6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
bundler (>= 1.3.0)
|
|
||||||
railties (= 6.0.3.7)
|
|
||||||
sprockets-rails (>= 2.0.0)
|
|
||||||
railties (6.0.3.7)
|
|
||||||
actionpack (= 6.0.3.7)
|
|
||||||
activesupport (= 6.0.3.7)
|
|
||||||
method_source
|
|
||||||
rake (>= 0.8.7)
|
|
||||||
thor (>= 0.20.3, < 2.0)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
ZenTest (4.12.0)
|
ZenTest (4.12.0)
|
||||||
|
actioncable (6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
nio4r (~> 2.0)
|
||||||
|
websocket-driver (>= 0.6.1)
|
||||||
|
actionmailbox (6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
activejob (= 6.1.3.2)
|
||||||
|
activerecord (= 6.1.3.2)
|
||||||
|
activestorage (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
mail (>= 2.7.1)
|
||||||
|
actionmailer (6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
actionview (= 6.1.3.2)
|
||||||
|
activejob (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
mail (~> 2.5, >= 2.5.4)
|
||||||
|
rails-dom-testing (~> 2.0)
|
||||||
|
actionpack (6.1.3.2)
|
||||||
|
actionview (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
rack (~> 2.0, >= 2.0.9)
|
||||||
|
rack-test (>= 0.6.3)
|
||||||
|
rails-dom-testing (~> 2.0)
|
||||||
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
|
actiontext (6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
activerecord (= 6.1.3.2)
|
||||||
|
activestorage (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
nokogiri (>= 1.8.5)
|
||||||
|
actionview (6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
builder (~> 3.1)
|
||||||
|
erubi (~> 1.4)
|
||||||
|
rails-dom-testing (~> 2.0)
|
||||||
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||||
|
activejob (6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
globalid (>= 0.3.6)
|
||||||
|
activemodel (6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
activemodel-serializers-xml (1.0.2)
|
activemodel-serializers-xml (1.0.2)
|
||||||
activemodel (> 5.x)
|
activemodel (> 5.x)
|
||||||
activesupport (> 5.x)
|
activesupport (> 5.x)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
|
activerecord (6.1.3.2)
|
||||||
|
activemodel (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
activestorage (6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
activejob (= 6.1.3.2)
|
||||||
|
activerecord (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
marcel (~> 1.0.0)
|
||||||
|
mini_mime (~> 1.0.2)
|
||||||
|
activesupport (6.1.3.2)
|
||||||
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
|
i18n (>= 1.6, < 2)
|
||||||
|
minitest (>= 5.1)
|
||||||
|
tzinfo (~> 2.0)
|
||||||
|
zeitwerk (~> 2.3)
|
||||||
addressable (2.7.0)
|
addressable (2.7.0)
|
||||||
public_suffix (>= 2.0.2, < 5.0)
|
public_suffix (>= 2.0.2, < 5.0)
|
||||||
amq-protocol (2.3.2)
|
amq-protocol (2.3.2)
|
||||||
@ -255,7 +232,7 @@ GEM
|
|||||||
nokogiri (~> 1)
|
nokogiri (~> 1)
|
||||||
rake
|
rake
|
||||||
mini_magick (4.11.0)
|
mini_magick (4.11.0)
|
||||||
mini_mime (1.1.0)
|
mini_mime (1.0.3)
|
||||||
mini_portile2 (2.5.1)
|
mini_portile2 (2.5.1)
|
||||||
minitest (5.14.4)
|
minitest (5.14.4)
|
||||||
minitest-autotest (1.1.1)
|
minitest-autotest (1.1.1)
|
||||||
@ -319,6 +296,21 @@ GEM
|
|||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
|
rails (6.1.3.2)
|
||||||
|
actioncable (= 6.1.3.2)
|
||||||
|
actionmailbox (= 6.1.3.2)
|
||||||
|
actionmailer (= 6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
actiontext (= 6.1.3.2)
|
||||||
|
actionview (= 6.1.3.2)
|
||||||
|
activejob (= 6.1.3.2)
|
||||||
|
activemodel (= 6.1.3.2)
|
||||||
|
activerecord (= 6.1.3.2)
|
||||||
|
activestorage (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
bundler (>= 1.15.0)
|
||||||
|
railties (= 6.1.3.2)
|
||||||
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.5)
|
rails-controller-testing (1.0.5)
|
||||||
actionpack (>= 5.0.1.rc1)
|
actionpack (>= 5.0.1.rc1)
|
||||||
actionview (>= 5.0.1.rc1)
|
actionview (>= 5.0.1.rc1)
|
||||||
@ -346,6 +338,12 @@ GEM
|
|||||||
rails (>= 5.0, < 7)
|
rails (>= 5.0, < 7)
|
||||||
remotipart (~> 1.3)
|
remotipart (~> 1.3)
|
||||||
sassc-rails (>= 1.3, < 3)
|
sassc-rails (>= 1.3, < 3)
|
||||||
|
railties (6.1.3.2)
|
||||||
|
actionpack (= 6.1.3.2)
|
||||||
|
activesupport (= 6.1.3.2)
|
||||||
|
method_source
|
||||||
|
rake (>= 0.8.7)
|
||||||
|
thor (~> 1.0)
|
||||||
rainbow (3.0.0)
|
rainbow (3.0.0)
|
||||||
rake (13.0.3)
|
rake (13.0.3)
|
||||||
ransack (2.4.2)
|
ransack (2.4.2)
|
||||||
@ -471,13 +469,12 @@ GEM
|
|||||||
influxdb
|
influxdb
|
||||||
temple (0.8.2)
|
temple (0.8.2)
|
||||||
thor (1.1.0)
|
thor (1.1.0)
|
||||||
thread_safe (0.3.6)
|
|
||||||
tilt (2.0.10)
|
tilt (2.0.10)
|
||||||
turbolinks (5.2.1)
|
turbolinks (5.2.1)
|
||||||
turbolinks-source (~> 5.2)
|
turbolinks-source (~> 5.2)
|
||||||
turbolinks-source (5.2.0)
|
turbolinks-source (5.2.0)
|
||||||
tzinfo (1.2.9)
|
tzinfo (2.0.4)
|
||||||
thread_safe (~> 0.1)
|
concurrent-ruby (~> 1.0)
|
||||||
uglifier (4.2.0)
|
uglifier (4.2.0)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
@ -552,7 +549,7 @@ DEPENDENCIES
|
|||||||
puma
|
puma
|
||||||
pundit
|
pundit
|
||||||
rack-mini-profiler
|
rack-mini-profiler
|
||||||
rails!
|
rails (~> 6.1.0)
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
rails-i18n
|
rails-i18n
|
||||||
rails-timeago
|
rails-timeago
|
||||||
|
@ -2,7 +2,7 @@ class InternalUser < User
|
|||||||
|
|
||||||
authenticates_with_sorcery!
|
authenticates_with_sorcery!
|
||||||
|
|
||||||
validates :email, presence: true, uniqueness: true, case_sensitive: false
|
validates :email, presence: true, uniqueness: true
|
||||||
validates :password, confirmation: true, if: :password_void?, on: :update, presence: true
|
validates :password, confirmation: true, if: :password_void?, on: :update, presence: true
|
||||||
validates :role, inclusion: {in: ROLES}
|
validates :role, inclusion: {in: ROLES}
|
||||||
|
|
||||||
|
10
bin/rails
10
bin/rails
@ -1,9 +1,5 @@
|
|||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
begin
|
load File.expand_path("spring", __dir__)
|
||||||
load File.expand_path('../spring', __FILE__)
|
|
||||||
rescue LoadError => e
|
|
||||||
raise unless e.message.include?('spring')
|
|
||||||
end
|
|
||||||
APP_PATH = File.expand_path('../config/application', __dir__)
|
APP_PATH = File.expand_path('../config/application', __dir__)
|
||||||
require_relative '../config/boot'
|
require_relative "../config/boot"
|
||||||
require 'rails/commands'
|
require "rails/commands"
|
||||||
|
10
bin/rake
10
bin/rake
@ -1,9 +1,5 @@
|
|||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
begin
|
load File.expand_path("spring", __dir__)
|
||||||
load File.expand_path('../spring', __FILE__)
|
require_relative "../config/boot"
|
||||||
rescue LoadError => e
|
require "rake"
|
||||||
raise unless e.message.include?('spring')
|
|
||||||
end
|
|
||||||
require_relative '../config/boot'
|
|
||||||
require 'rake'
|
|
||||||
Rake.application.run
|
Rake.application.run
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
require 'fileutils'
|
require "fileutils"
|
||||||
|
|
||||||
# path to your application root.
|
# path to your application root.
|
||||||
APP_ROOT = File.expand_path('..', __dir__)
|
APP_ROOT = File.expand_path('..', __dir__)
|
||||||
@ -9,8 +9,8 @@ def system!(*args)
|
|||||||
end
|
end
|
||||||
|
|
||||||
FileUtils.chdir APP_ROOT do
|
FileUtils.chdir APP_ROOT do
|
||||||
# This script is a way to setup or update your development environment automatically.
|
# 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 anytime and get an expectable outcome.
|
# 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.
|
# Add necessary setup steps to this file.
|
||||||
|
|
||||||
puts '== Installing dependencies =='
|
puts '== Installing dependencies =='
|
||||||
@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
|
|||||||
system('bundle check') || system!('bundle install')
|
system('bundle check') || system!('bundle install')
|
||||||
|
|
||||||
# Install JavaScript dependencies
|
# Install JavaScript dependencies
|
||||||
# system('bin/yarn')
|
system! 'bin/yarn'
|
||||||
|
|
||||||
# puts "\n== Copying sample files =="
|
# puts "\n== Copying sample files =="
|
||||||
# unless File.exist?('config/database.yml')
|
# unless File.exist?('config/database.yml')
|
||||||
|
21
bin/spring
21
bin/spring
@ -1,17 +1,14 @@
|
|||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
|
if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
|
||||||
|
gem "bundler"
|
||||||
|
require "bundler"
|
||||||
|
|
||||||
# This file loads spring without using Bundler, in order to be fast.
|
# Load Spring without loading other gems in the Gemfile, for speed.
|
||||||
# It gets overwritten when you run the `spring binstub` command.
|
Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring|
|
||||||
|
|
||||||
unless defined?(Spring)
|
|
||||||
require 'rubygems'
|
|
||||||
require 'bundler'
|
|
||||||
|
|
||||||
lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
|
|
||||||
spring = lockfile.specs.detect { |spec| spec.name == "spring" }
|
|
||||||
if spring
|
|
||||||
Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
|
Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
|
||||||
gem 'spring', spring.version
|
gem "spring", spring.version
|
||||||
require 'spring/binstub'
|
require "spring/binstub"
|
||||||
|
rescue Gem::LoadError
|
||||||
|
# Ignore when Spring is not installed.
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
12
bin/yarn
12
bin/yarn
@ -1,9 +1,15 @@
|
|||||||
#!/usr/bin/env ruby
|
#!/usr/bin/env ruby
|
||||||
APP_ROOT = File.expand_path('..', __dir__)
|
APP_ROOT = File.expand_path('..', __dir__)
|
||||||
Dir.chdir(APP_ROOT) do
|
Dir.chdir(APP_ROOT) do
|
||||||
begin
|
yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
|
||||||
exec "yarnpkg", *ARGV
|
select { |dir| File.expand_path(dir) != __dir__ }.
|
||||||
rescue Errno::ENOENT
|
product(["yarn", "yarn.cmd", "yarn.ps1"]).
|
||||||
|
map { |dir, file| File.expand_path(file, dir) }.
|
||||||
|
find { |file| File.executable?(file) }
|
||||||
|
|
||||||
|
if yarn
|
||||||
|
exec yarn, *ARGV
|
||||||
|
else
|
||||||
$stderr.puts "Yarn executable was not detected in the system."
|
$stderr.puts "Yarn executable was not detected in the system."
|
||||||
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
|
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
# This file is used by Rack-based servers to start the application.
|
# This file is used by Rack-based servers to start the application.
|
||||||
|
|
||||||
require ::File.expand_path('../config/environment', __FILE__)
|
require_relative "config/environment"
|
||||||
|
|
||||||
map CodeOcean::Application.config.relative_url_root || '/' do
|
run Rails.application
|
||||||
run Rails.application
|
Rails.application.load_server
|
||||||
end
|
|
||||||
|
@ -11,17 +11,12 @@ require 'telegraf/rails'
|
|||||||
module CodeOcean
|
module CodeOcean
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
# Initialize configuration defaults for originally generated Rails version.
|
# Initialize configuration defaults for originally generated Rails version.
|
||||||
config.load_defaults 6.0
|
config.load_defaults 6.1
|
||||||
|
|
||||||
# In Rails 5.2.5, the CSRF token format is accidentally changed to urlsafe-encoded.
|
# Configuration for the application, engines, and railties goes here.
|
||||||
# If you upgrade apps from 5.2.5, set the config `urlsafe_csrf_tokens = true`.
|
#
|
||||||
# ToDo: Remove after upgrade to Rails 6.1
|
# These settings can be overridden in specific environments using the files
|
||||||
Rails.application.config.action_controller.urlsafe_csrf_tokens = true
|
# in config/environments, which are processed later.
|
||||||
|
|
||||||
# Settings in config/environments/* take precedence over those specified here.
|
|
||||||
# Application configuration can go into files in config/initializers
|
|
||||||
# -- all .rb files in that directory are automatically loaded after loading
|
|
||||||
# the framework and any gems in your application.
|
|
||||||
|
|
||||||
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
|
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
|
||||||
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
|
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require "active_support/core_ext/integer/time"
|
||||||
|
|
||||||
Rails.application.configure do
|
Rails.application.configure do
|
||||||
# Settings specified here will take precedence over those in config/application.rb.
|
# Settings specified here will take precedence over those in config/application.rb.
|
||||||
|
|
||||||
config.web_console.whitelisted_ips = '192.168.0.0/16'
|
config.web_console.whitelisted_ips = '192.168.0.0/16'
|
||||||
|
|
||||||
# In the development environment your application's code is reloaded on
|
# In the development environment your application's code is reloaded any time
|
||||||
# every request. This slows down response time but is perfect for development
|
# 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.
|
# since you don't have to restart the web server when you make code changes.
|
||||||
config.cache_classes = false
|
config.cache_classes = false
|
||||||
|
|
||||||
@ -43,6 +45,12 @@ Rails.application.configure do
|
|||||||
# Print deprecation notices to the Rails logger.
|
# Print deprecation notices to the Rails logger.
|
||||||
config.active_support.deprecation = :log
|
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.
|
# Raise an error on page load if there are pending migrations.
|
||||||
config.active_record.migration_error = :page_load
|
config.active_record.migration_error = :page_load
|
||||||
|
|
||||||
@ -57,9 +65,12 @@ Rails.application.configure do
|
|||||||
# Suppress logger output for asset requests.
|
# Suppress logger output for asset requests.
|
||||||
config.assets.quiet = true
|
config.assets.quiet = true
|
||||||
|
|
||||||
# Raises error for missing translations
|
# Raises error for missing translations.
|
||||||
config.action_view.raise_on_missing_translations = true
|
config.action_view.raise_on_missing_translations = true
|
||||||
|
|
||||||
|
# Annotate rendered view with file names.
|
||||||
|
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||||
|
|
||||||
# Adds additional error checking when serving assets at runtime.
|
# Adds additional error checking when serving assets at runtime.
|
||||||
# Checks for improperly declared sprockets dependencies.
|
# Checks for improperly declared sprockets dependencies.
|
||||||
# Raises helpful error messages.
|
# Raises helpful error messages.
|
||||||
@ -72,4 +83,7 @@ Rails.application.configure do
|
|||||||
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
|
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
|
||||||
# If the evented file watcher doesn't work (in Vagrant), use another one:
|
# If the evented file watcher doesn't work (in Vagrant), use another one:
|
||||||
# config.file_watcher = ActiveSupport::FileUpdateChecker
|
# config.file_watcher = ActiveSupport::FileUpdateChecker
|
||||||
|
|
||||||
|
# Uncomment if you wish to allow Action Cable access from any origin.
|
||||||
|
# config.action_cable.disable_request_forgery_protection = true
|
||||||
end
|
end
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require "active_support/core_ext/integer/time"
|
||||||
|
|
||||||
Rails.application.configure do
|
Rails.application.configure do
|
||||||
# Settings specified here will take precedence over those in config/application.rb.
|
# Settings specified here will take precedence over those in config/application.rb.
|
||||||
|
|
||||||
@ -33,7 +35,7 @@ Rails.application.configure do
|
|||||||
config.assets.compile = false
|
config.assets.compile = false
|
||||||
|
|
||||||
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
|
# 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.
|
# 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-Sendfile' # for Apache
|
||||||
@ -50,9 +52,9 @@ Rails.application.configure do
|
|||||||
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
|
# 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
|
# Include generic and useful information about system operation, but avoid logging too much
|
||||||
# when problems arise.
|
# information to avoid inadvertent exposure of personally identifiable information (PII).
|
||||||
config.log_level = :error
|
config.log_level = :info
|
||||||
|
|
||||||
# Prepend all log lines with the following tags.
|
# Prepend all log lines with the following tags.
|
||||||
# config.log_tags = [ :subdomain, :uuid, :request_id ]
|
# config.log_tags = [ :subdomain, :uuid, :request_id ]
|
||||||
@ -77,6 +79,12 @@ Rails.application.configure do
|
|||||||
# Send deprecation notices to registered listeners.
|
# Send deprecation notices to registered listeners.
|
||||||
config.active_support.deprecation = :notify
|
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.
|
# Use default logging formatter so that PID and timestamp are not suppressed.
|
||||||
config.log_formatter = ::Logger::Formatter.new
|
config.log_formatter = ::Logger::Formatter.new
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require "active_support/core_ext/integer/time"
|
||||||
|
|
||||||
# The test environment is used exclusively to run your application's
|
# The test environment is used exclusively to run your application's
|
||||||
# test suite. You never need to work with it otherwise. Remember that
|
# 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
|
# your test database is "scratch space" for the test suite and is wiped
|
||||||
@ -9,6 +11,7 @@ Rails.application.configure do
|
|||||||
# Settings specified here will take precedence over those in config/application.rb.
|
# Settings specified here will take precedence over those in config/application.rb.
|
||||||
|
|
||||||
config.cache_classes = false
|
config.cache_classes = false
|
||||||
|
config.action_view.cache_template_loading = true
|
||||||
|
|
||||||
# Do not eager load code on boot. This avoids loading your whole application
|
# 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
|
# just for the purpose of running a single test. If you are using a tool that
|
||||||
@ -49,6 +52,15 @@ Rails.application.configure do
|
|||||||
# Print deprecation notices to the stderr.
|
# Print deprecation notices to the stderr.
|
||||||
config.active_support.deprecation = :stderr
|
config.active_support.deprecation = :stderr
|
||||||
|
|
||||||
|
# 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 = []
|
||||||
|
|
||||||
# Raises error for missing translations.
|
# Raises error for missing translations.
|
||||||
# config.action_view.raise_on_missing_translations = true
|
# config.i18n.raise_on_missing_translations = true
|
||||||
|
|
||||||
|
# Annotate rendered view with file names.
|
||||||
|
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||||
end
|
end
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
# Be sure to restart your server when you modify this file.
|
# 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.
|
# 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.
|
# 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!
|
# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
|
||||||
|
Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
# Be sure to restart your server when you modify this file.
|
# Be sure to restart your server when you modify this file.
|
||||||
|
|
||||||
# Configure sensitive parameters which will be filtered from the log file.
|
# Configure sensitive parameters which will be filtered from the log file.
|
||||||
Rails.application.config.filter_parameters += [:password]
|
Rails.application.config.filter_parameters += [
|
||||||
|
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
|
||||||
|
]
|
||||||
|
11
config/initializers/permissions_policy.rb
Normal file
11
config/initializers/permissions_policy.rb
Normal file
@ -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
|
@ -8,6 +8,11 @@ max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
|
|||||||
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
|
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
|
||||||
threads min_threads_count, max_threads_count
|
threads min_threads_count, max_threads_count
|
||||||
|
|
||||||
|
# Specifies the `worker_timeout` threshold that Puma will use to wait before
|
||||||
|
# terminating a worker in development environments.
|
||||||
|
#
|
||||||
|
worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
|
||||||
|
|
||||||
# Specifies the `port` that Puma will listen on to receive requests; default is 7000.
|
# Specifies the `port` that Puma will listen on to receive requests; default is 7000.
|
||||||
#
|
#
|
||||||
port ENV.fetch("PORT") { 7000 }
|
port ENV.fetch("PORT") { 7000 }
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
# This migration comes from active_storage (originally 20190112182829)
|
||||||
|
class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
|
||||||
|
def up
|
||||||
|
if table_exists?(:active_storage_blobs)
|
||||||
|
unless column_exists?(:active_storage_blobs, :service_name)
|
||||||
|
add_column :active_storage_blobs, :service_name, :string
|
||||||
|
|
||||||
|
if configured_service = ActiveStorage::Blob.service.name
|
||||||
|
ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
|
||||||
|
end
|
||||||
|
|
||||||
|
change_column :active_storage_blobs, :service_name, :string, null: false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
if table_exists?(:active_storage_blobs)
|
||||||
|
remove_column :active_storage_blobs, :service_name
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,14 @@
|
|||||||
|
# This migration comes from active_storage (originally 20191206030411)
|
||||||
|
class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
|
||||||
|
def change
|
||||||
|
if table_exists?(:active_storage_blobs)
|
||||||
|
create_table :active_storage_variant_records do |t|
|
||||||
|
t.belongs_to :blob, null: false, index: false
|
||||||
|
t.string :variation_digest, null: false
|
||||||
|
|
||||||
|
t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
|
||||||
|
t.foreign_key :active_storage_blobs, column: :blob_id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -2,15 +2,15 @@
|
|||||||
# of editing this file, please use the migrations feature of Active Record to
|
# of editing this file, please use the migrations feature of Active Record to
|
||||||
# incrementally modify your database, and then regenerate this schema definition.
|
# incrementally modify your database, and then regenerate this schema definition.
|
||||||
#
|
#
|
||||||
# This file is the source Rails uses to define your schema when running `rails
|
# This file is the source Rails uses to define your schema when running `bin/rails
|
||||||
# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
|
# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
|
||||||
# be faster and is potentially less error prone than running all of your
|
# be faster and is potentially less error prone than running all of your
|
||||||
# migrations from scratch. Old migrations may fail to apply correctly if those
|
# migrations from scratch. Old migrations may fail to apply correctly if those
|
||||||
# migrations use external dependencies or application code.
|
# migrations use external dependencies or application code.
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 2021_05_10_174452) do
|
ActiveRecord::Schema.define(version: 2021_05_12_133612) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "pg_trgm"
|
enable_extension "pg_trgm"
|
||||||
|
Reference in New Issue
Block a user