cafe-grader-web Commit - r819:60250a6ea113

cafe-grader-web

Commit `r819:60250a6ea113` public

parent | child

Description:

rails 6

Commit status:

[Not Reviewed]

References:

upgrade_rails7

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r819:60250a6ea113 - Fri, 14 Jan 2022 03:29:21 - 21 files changed: 301 inserted, 112 deleted

bin/spring created 755 ¶ +14

@@ -0,0 +1,14
	1	+ #!/usr/bin/env ruby
	2	+ if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
	3	+ gem "bundler"
	4	+ require "bundler"
	5	+
	6	+ # Load Spring without loading other gems in the Gemfile, for speed.
	7	+ Bundler.locked_gems&.specs&.find { \|spec\| spec.name == "spring" }&.tap do \|spring\|
	8	+ Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
	9	+ gem "spring", spring.version
	10	+ require "spring/binstub"
	11	+ rescue Gem::LoadError
	12	+ # Ignore when Spring is not installed.
	13	+ end
	14	+ end

config/initializers/new_framework_defaults_6_1.rb created 644 ¶ +67

@@ -0,0 +1,67
	1	+ # Be sure to restart your server when you modify this file.
	2	+ #
	3	+ # This file contains migration options to ease your Rails 6.1 upgrade.
	4	+ #
	5	+ # Once upgraded flip defaults one by one to migrate to the new default.
	6	+ #
	7	+ # Read the Guide for Upgrading Ruby on Rails for more info on each option.
	8	+
	9	+ # Support for inversing belongs_to -> has_many Active Record associations.
	10	+ # Rails.application.config.active_record.has_many_inversing = true
	11	+
	12	+ # Track Active Storage variants in the database.
	13	+ # Rails.application.config.active_storage.track_variants = true
	14	+
	15	+ # Apply random variation to the delay when retrying failed jobs.
	16	+ # Rails.application.config.active_job.retry_jitter = 0.15
	17	+
	18	+ # Stop executing `after_enqueue`/`after_perform` callbacks if
	19	+ # `before_enqueue`/`before_perform` respectively halts with `throw :abort`.
	20	+ # Rails.application.config.active_job.skip_after_callbacks_if_terminated = true
	21	+
	22	+ # Specify cookies SameSite protection level: either :none, :lax, or :strict.
	23	+ #
	24	+ # This change is not backwards compatible with earlier Rails versions.
	25	+ # It's best enabled when your entire app is migrated and stable on 6.1.
	26	+ # Rails.application.config.action_dispatch.cookies_same_site_protection = :lax
	27	+
	28	+ # Generate CSRF tokens that are encoded in URL-safe Base64.
	29	+ #
	30	+ # This change is not backwards compatible with earlier Rails versions.
	31	+ # It's best enabled when your entire app is migrated and stable on 6.1.
	32	+ # Rails.application.config.action_controller.urlsafe_csrf_tokens = true
	33	+
	34	+ # Specify whether `ActiveSupport::TimeZone.utc_to_local` returns a time with an
	35	+ # UTC offset or a UTC time.
	36	+ # ActiveSupport.utc_to_local_returns_utc_offset_times = true
	37	+
	38	+ # Change the default HTTP status code to `308` when redirecting non-GET/HEAD
	39	+ # requests to HTTPS in `ActionDispatch::SSL` middleware.
	40	+ # Rails.application.config.action_dispatch.ssl_default_redirect_status = 308
	41	+
	42	+ # Use new connection handling API. For most applications this won't have any
	43	+ # effect. For applications using multiple databases, this new API provides
	44	+ # support for granular connection swapping.
	45	+ # Rails.application.config.active_record.legacy_connection_handling = false
	46	+
	47	+ # Make `form_with` generate non-remote forms by default.
	48	+ # Rails.application.config.action_view.form_with_generates_remote_forms = false
	49	+
	50	+ # Set the default queue name for the analysis job to the queue adapter default.
	51	+ # Rails.application.config.active_storage.queues.analysis = nil
	52	+
	53	+ # Set the default queue name for the purge job to the queue adapter default.
	54	+ # Rails.application.config.active_storage.queues.purge = nil
	55	+
	56	+ # Set the default queue name for the incineration job to the queue adapter default.
	57	+ # Rails.application.config.action_mailbox.queues.incineration = nil
	58	+
	59	+ # Set the default queue name for the routing job to the queue adapter default.
	60	+ # Rails.application.config.action_mailbox.queues.routing = nil
	61	+
	62	+ # Set the default queue name for the mail deliver job to the queue adapter default.
	63	+ # Rails.application.config.action_mailer.deliver_later_queue_name = nil
	64	+
	65	+ # Generate a `Link` header that gives a hint to modern browsers about
	66	+ # preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`.
	67	+ # Rails.application.config.action_view.preload_links_header = true

config/initializers/permissions_policy.rb created 644 ¶ +11

@@ -0,0 +1,11
	1	+ # Define an application-wide HTTP permissions policy. For further
	2	+ # information see https://developers.google.com/web/updates/2018/06/feature-policy
	3	+ #
	4	+ # Rails.application.config.permissions_policy do \|f\|
	5	+ # f.camera :none
	6	+ # f.gyroscope :none
	7	+ # f.microphone :none
	8	+ # f.usb :none
	9	+ # f.fullscreen :self
	10	+ # f.payment :self, "https://secure.example.com"
	11	+ # end

Gemfile ¶ +1 -1

               source 'https://rubygems.org'
               git_source(:github) { |repo| "https://github.com/#{repo}.git" }
               #rails
-            - gem 'rails', '~>5.2'
+            + gem 'rails', '~>6.0'
               gem 'activerecord-session_store'
               gem 'puma'
               # Reduces boot times through caching; required in config/boot.rb
               gem 'bootsnap', '>= 1.1.0', require: false

Gemfile.lock ¶ +74 -55

                 remote: https://rubygems.org/
                 specs:
                   RubyInline (3.12.5)
                     ZenTest (~> 4.3)
                   ZenTest (4.12.0)
                   ace-rails-ap (4.4)
-            -     actioncable (5.2.6)
+            +     actioncable (6.1.4.4)
-            -       actionpack (= 5.2.6)
+            +       actionpack (= 6.1.4.4)
+            +       activesupport (= 6.1.4.4)
                     nio4r (~> 2.0)
                     websocket-driver (>= 0.6.1)
-            -     actionmailer (5.2.6)
+            +     actionmailbox (6.1.4.4)
-            -       actionpack (= 5.2.6)
+            +       actionpack (= 6.1.4.4)
-            -       actionview (= 5.2.6)
+            +       activejob (= 6.1.4.4)
-            -       activejob (= 5.2.6)
+            +       activerecord (= 6.1.4.4)
+            +       activestorage (= 6.1.4.4)
+            +       activesupport (= 6.1.4.4)
+            +       mail (>= 2.7.1)
+            +     actionmailer (6.1.4.4)
+            +       actionpack (= 6.1.4.4)
+            +       actionview (= 6.1.4.4)
+            +       activejob (= 6.1.4.4)
+            +       activesupport (= 6.1.4.4)
                     mail (~> 2.5, >= 2.5.4)
                     rails-dom-testing (~> 2.0)
-            -     actionpack (5.2.6)
+            +     actionpack (6.1.4.4)
-            -       actionview (= 5.2.6)
+            +       actionview (= 6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       activesupport (= 6.1.4.4)
-            -       rack (~> 2.0, >= 2.0.8)
+            +       rack (~> 2.0, >= 2.0.9)
                     rack-test (>= 0.6.3)
                     rails-dom-testing (~> 2.0)
-            -       rails-html-sanitizer (~> 1.0, >= 1.0.2)
+            +       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-            -     actionview (5.2.6)
+            +     actiontext (6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       actionpack (= 6.1.4.4)
+            +       activerecord (= 6.1.4.4)
+            +       activestorage (= 6.1.4.4)
+            +       activesupport (= 6.1.4.4)
+            +       nokogiri (>= 1.8.5)
+            +     actionview (6.1.4.4)
+            +       activesupport (= 6.1.4.4)
                     builder (~> 3.1)
                     erubi (~> 1.4)
                     rails-dom-testing (~> 2.0)
-            -       rails-html-sanitizer (~> 1.0, >= 1.0.3)
+            +       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-            -     activejob (5.2.6)
+            +     activejob (6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       activesupport (= 6.1.4.4)
                     globalid (>= 0.3.6)
-            -     activemodel (5.2.6)
+            +     activemodel (6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       activesupport (= 6.1.4.4)
-            -     activerecord (5.2.6)
+            +     activerecord (6.1.4.4)
-            -       activemodel (= 5.2.6)
+            +       activemodel (= 6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       activesupport (= 6.1.4.4)
-            -       arel (>= 9.0)
                   activerecord-session_store (2.0.0)
                     actionpack (>= 5.2.4.1)
                     activerecord (>= 5.2.4.1)
                     multi_json (~> 1.11, >= 1.11.2)
                     rack (>= 2.0.8, < 3)
                     railties (>= 5.2.4.1)
-            -     activestorage (5.2.6)
+            +     activestorage (6.1.4.4)
-            -       actionpack (= 5.2.6)
+            +       actionpack (= 6.1.4.4)
-            -       activerecord (= 5.2.6)
+            +       activejob (= 6.1.4.4)
+            +       activerecord (= 6.1.4.4)
+            +       activesupport (= 6.1.4.4)
                     marcel (~> 1.0.0)
-            -     activesupport (5.2.6)
+            +       mini_mime (>= 1.1.0)
+            +     activesupport (6.1.4.4)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
-            -       i18n (>= 0.7, < 2)
+            +       i18n (>= 1.6, < 2)
-            -       minitest (~> 5.1)
+            +       minitest (>= 5.1)
-            -       tzinfo (~> 1.1)
+            +       tzinfo (~> 2.0)
+            +       zeitwerk (~> 2.3)
                   addressable (2.8.0)
                     public_suffix (>= 2.0.2, < 5.0)
                   ansi (1.5.0)
-            -     arel (9.0.0)
                   autoprefixer-rails (10.4.2.0)
                     execjs (~> 2)
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
                   bindex (0.8.1)
                   puma (5.5.2)
                     nio4r (~> 2.0)
                   racc (1.6.0)
                   rack (2.2.3)
                   rack-test (1.1.0)
                     rack (>= 1.0, < 3)
-            -     rails (5.2.6)
+            +     rails (6.1.4.4)
-            -       actioncable (= 5.2.6)
+            +       actioncable (= 6.1.4.4)
-            -       actionmailer (= 5.2.6)
+            +       actionmailbox (= 6.1.4.4)
-            -       actionpack (= 5.2.6)
+            +       actionmailer (= 6.1.4.4)
-            -       actionview (= 5.2.6)
+            +       actionpack (= 6.1.4.4)
-            -       activejob (= 5.2.6)
+            +       actiontext (= 6.1.4.4)
-            -       activemodel (= 5.2.6)
+            +       actionview (= 6.1.4.4)
-            -       activerecord (= 5.2.6)
+            +       activejob (= 6.1.4.4)
-            -       activestorage (= 5.2.6)
+            +       activemodel (= 6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       activerecord (= 6.1.4.4)
-            -       bundler (>= 1.3.0)
+            +       activestorage (= 6.1.4.4)
-            -       railties (= 5.2.6)
+            +       activesupport (= 6.1.4.4)
+            +       bundler (>= 1.15.0)
+            +       railties (= 6.1.4.4)
                     sprockets-rails (>= 2.0.0)
                   rails-controller-testing (1.0.5)
                     actionpack (>= 5.0.1.rc1)
                     actionview (>= 5.0.1.rc1)
                     activesupport (>= 5.0.1.rc1)
                   rails-dom-testing (2.0.3)
                     activesupport (>= 4.2.0)
                     nokogiri (>= 1.6)
                   rails-html-sanitizer (1.4.2)
                     loofah (~> 2.3)
                   rails_bootstrap_sortable (2.0.7)
                     momentjs-rails (>= 2.8.3)
-            -     railties (5.2.6)
+            +     railties (6.1.4.4)
-            -       actionpack (= 5.2.6)
+            +       actionpack (= 6.1.4.4)
-            -       activesupport (= 5.2.6)
+            +       activesupport (= 6.1.4.4)
                     method_source
-            -       rake (>= 0.8.7)
+            +       rake (>= 0.13)
-            -       thor (>= 0.19.0, < 2.0)
+            +       thor (~> 1.0)
                   rake (13.0.6)
                   rb-fsevent (0.11.0)
                   rb-inotify (0.10.1)
                     ffi (~> 1.0)
                   rdiscount (2.2.0.2)
                   regexp_parser (2.2.0)
                     actionpack (>= 5.2)
                     activesupport (>= 5.2)
                     sprockets (>= 3.0.0)
                   sqlite3 (1.4.2)
                   temple (0.8.2)
                   thor (1.2.1)
-            -     thread_safe (0.3.6)
                   tilt (2.0.10)
-            -     tzinfo (1.2.9)
+            +     tzinfo (2.0.4)
-            -       thread_safe (~> 0.1)
+            +       concurrent-ruby (~> 1.0)
                   uglifier (4.2.0)
                     execjs (>= 0.3.0, < 3)
-            -     web-console (3.7.0)
+            +     web-console (4.2.0)
-            -       actionview (>= 5.0)
+            +       actionview (>= 6.0.0)
-            -       activemodel (>= 5.0)
+            +       activemodel (>= 6.0.0)
                     bindex (>= 0.4.0)
-            -       railties (>= 5.0)
+            +       railties (>= 6.0.0)
                   webdriver (0.19.0)
                   websocket-driver (0.7.5)
                     websocket-extensions (>= 0.1.0)
                   websocket-extensions (0.1.5)
                   xpath (3.2.0)
                     nokogiri (~> 1.8)
                   yaml_db (0.7.0)
                     rails (>= 3.0)
                     rake (>= 0.8.7)
+            +     zeitwerk (2.5.3)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 listen (>= 3.0.5, < 3.2)
                 mail
                 minitest-reporters
                 momentjs-rails (>= 2.9.0)
                 mysql2
                 puma
-            -   rails (~> 5.2)
+            +   rails (~> 6.0)
                 rails-controller-testing
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 sassc-rails
                 select2-rails

bin/rails ¶ +3 -2

@@ -1,4 +1,5
1	#!/usr/bin/env ruby	1	#!/usr/bin/env ruby
		2	+ load File.expand_path("spring", __dir__)
2	APP_PATH = File.expand_path('../config/application', __dir__)	3	APP_PATH = File.expand_path('../config/application', __dir__)
3	- require_relative '../config/boot'	4	+ require_relative "../config/boot"
4	- require 'rails/commands'	5	+ require "rails/commands"

bin/rake ¶ +3 -2

@@ -1,4 +1,5
1	#!/usr/bin/env ruby	1	#!/usr/bin/env ruby
2	- require_relative '../config/boot'	2	+ load File.expand_path("spring", __dir__)
3	- require 'rake'	3	+ require_relative "../config/boot"
		4	+ require "rake"
4	Rake.application.run	5	Rake.application.run

bin/setup ¶ +8 -8

               #!/usr/bin/env ruby
-            - require 'fileutils'
+            + require "fileutils"
-            - include FileUtils
               # path to your application root.
               APP_ROOT = File.expand_path('..', __dir__)
               def system!(*args)
                 system(*args) || abort("\n== Command #{args} failed ==")
               end
-            - chdir APP_ROOT do
+            + FileUtils.chdir APP_ROOT do
-            -   # This script is a starting point to setup your application.
+            +   # 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 =='
                 system! 'gem install bundler --conservative'
                 system('bundle check') || system!('bundle install')
-            -   # Install JavaScript dependencies if using Yarn
+            +   # Install JavaScript dependencies
-            -   # system('bin/yarn')
+            +   system! 'bin/yarn'
                 # 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'

bin/yarn ¶ +9 -3

               #!/usr/bin/env ruby
               APP_ROOT = File.expand_path('..', __dir__)
               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 "Download Yarn at https://yarnpkg.com/en/docs/install"
                   exit 1
                 end
               end

config.ru ¶ +4 -2

@@ -1,4 +1,6
1	# This file is used by Rack-based servers to start the application.	1	# This file is used by Rack-based servers to start the application.
2		2
3	- require ::File.expand_path('../config/environment', __FILE__)	3	+ require_relative "config/environment"
4	- run CafeGrader::Application	4	+
		5	+ run Rails.application
		6	+ Rails.application.load_server

config/boot.rb ¶ +2 -2

               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.
-            - require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+            + require "bootsnap/setup" # Speed up boot time by caching expensive operations.

config/cable.yml ¶ +1 -1

               development:
                 adapter: async
               test:
-            -   adapter: async
+            +   adapter: test
               production:
                 adapter: redis
                 url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
                 channel_prefix: cafe_grader_production

config/environment.rb ¶ +1 -1

               # Load the Rails application.
-            - require_relative 'application'
+            + require_relative "application"
               # Initialize the Rails application.
               Rails.application.initialize!

config/environments/development.rb ¶ +18 -5

               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
+            +   # 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.
                 config.cache_classes = false
                 # Do not eager load code on boot.
                 config.eager_load = false
                 config.consider_all_requests_local = true
                 # Enable/disable caching. By default caching is disabled.
                 # Run rails dev:cache to toggle caching.
                 if Rails.root.join('tmp', 'caching-dev.txt').exist?
                   config.action_controller.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=#{2.days.to_i}"
                   }
                 else
                   config.action_controller.perform_caching = false
                   config.cache_store = :null_store
                 end
-            -   # Store uploaded files on the local file system (see config/storage.yml for options)
+            +   # 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
                 # number of complex assets.
                 config.assets.debug = true
                 # Suppress logger output for asset requests.
                 config.assets.quiet = true
-            -   # 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
                 # 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
               end

config/environments/production.rb ¶ +36 -12

                 # 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.
+            +   # Compress CSS using a preprocessor.
-            -   config.assets.js_compressor = :uglifier
                 # 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
-            -   # Store uploaded files on the local file system (see config/storage.yml for options)
+            +   # 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
+            +   # 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
-            -   # 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 = :debug
+            +   config.log_level = :info
                 # Prepend all log lines with the following tags.
                 config.log_tags = [ :request_id ]
                 # 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 = "cafe_grader_#{Rails.env}"
+            +   # config.active_job.queue_name_prefix = "cafe_grader_production"
                 config.action_mailer.perform_caching = false
                 # Ignore bad email addresses and do not raise email delivery errors.
                 # Set this to true and configure the email server for immediate delivery to raise delivery errors.
                 # config.action_mailer.raise_delivery_errors = false
                 # the I18n.default_locale when a translation cannot be found).
                 config.i18n.fallbacks = true
                 # 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'
                 # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
                   logger.formatter = config.log_formatter
                   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
               end

config/environments/test.rb ¶ +20 -6

-            - Rails.application.configure do
+            + require "active_support/core_ext/integer/time"
-            -   # 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
+            + Rails.application.configure do
+            +   # Settings specified here will take precedence over those in config/application.rb.
+            +
+            +   config.cache_classes = false
+            +   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
                   '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
-            -   # Store uploaded files on the local file system in a temporary directory
+            +   # 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
                 # Print deprecation notices to the stderr.
                 config.active_support.deprecation = :stderr
-            -   # Raises error for missing translations
+            +   # Raise exceptions for disallowed deprecations.
-            -   # config.action_view.raise_on_missing_translations = true
+            +   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.
+            +   # config.i18n.raise_on_missing_translations = true
+            +
+            +   # Annotate rendered view with file names.
+            +   # config.action_view.annotate_rendered_view_with_filenames = true
               end

config/initializers/backtrace_silencers.rb ¶ +4 -3

               # 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.
+            + # 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"]

config/initializers/content_security_policy.rb ¶ +5

               #   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
+            + #   # If you are using webpack-dev-server then specify webpack-dev-server host
+            + #   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
               #   # 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

config/initializers/filter_parameter_logging.rb ¶ +3 -1

               # 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, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+            + ]

config/puma.rb ¶ +11 -2

               # Puma can serve each request in a thread from an internal thread pool.
               # 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.
               #
-            - threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+            + max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-            - threads threads_count, threads_count
+            + min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { 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 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 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).
               #

config/spring.rb ¶ +6 -6

@@ -1,6 +1,6
1	- %w(	1	+ Spring.watch(
2	- .ruby-version	2	+ ".ruby-version",
3	- .rbenv-vars	3	+ ".rbenv-vars",
4	- tmp/restart.txt	4	+ "tmp/restart.txt",
5	- tmp/caching-dev.txt	5	+ "tmp/caching-dev.txt"
6	- ).each { \|path\| Spring.watch(path) }	6	+ )

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r819:60250a6ea113 - Fri, 14 Jan 2022 03:29:21 - 21 files changed: 301 inserted, 112 deleted

Sign in to your account

Commit r819:60250a6ea113 public

Author

r819:60250a6ea113 - Fri, 14 Jan 2022 03:29:21 - 21 files changed: 301 inserted, 112 deleted

Commit `r819:60250a6ea113` public