cafe-grader-web Commit - r750:d729ef9d227c

cafe-grader-web

Commit `r750:d729ef9d227c` public

parent | child

Description:

upgrade to rails 5.2

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r750:d729ef9d227c - Thu, 04 Jul 2019 05:55:10 - 18 files changed: 305 inserted, 106 deleted

bin/yarn created 755 ¶ +11

@@ -0,0 +1,11
	1	+ #!/usr/bin/env ruby
	2	+ APP_ROOT = File.expand_path('..', __dir__)
	3	+ Dir.chdir(APP_ROOT) do
	4	+ begin
	5	+ exec "yarnpkg", *ARGV
	6	+ rescue Errno::ENOENT
	7	+ $stderr.puts "Yarn executable was not detected in the system."
	8	+ $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
	9	+ exit 1
	10	+ end
	11	+ end

config/initializers/content_security_policy.rb created 644 ¶ +25

@@ -0,0 +1,25
	1	+ # Be sure to restart your server when you modify this file.
	2	+
	3	+ # Define an application-wide content security policy
	4	+ # For further information see the following documentation
	5	+ # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
	6	+
	7	+ # Rails.application.config.content_security_policy do \|policy\|
	8	+ # policy.default_src :self, :https
	9	+ # policy.font_src :self, :https, :data
	10	+ # policy.img_src :self, :https, :data
	11	+ # policy.object_src :none
	12	+ # policy.script_src :self, :https
	13	+ # policy.style_src :self, :https
	14	+
	15	+ # # Specify URI for violation reports
	16	+ # # policy.report_uri "/csp-violation-report-endpoint"
	17	+ # end
	18	+
	19	+ # If you are using UJS then enable automatic nonce generation
	20	+ # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
	21	+
	22	+ # Report CSP violations to a specified URI
	23	+ # For further information see the following documentation:
	24	+ # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
	25	+ # Rails.application.config.content_security_policy_report_only = true

config/initializers/new_framework_defaults_5_2.rb created 644 ¶ +38

@@ -0,0 +1,38
	1	+ # Be sure to restart your server when you modify this file.
	2	+ #
	3	+ # This file contains migration options to ease your Rails 5.2 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	+ # Make Active Record use stable #cache_key alongside new #cache_version method.
	10	+ # This is needed for recyclable cache keys.
	11	+ # Rails.application.config.active_record.cache_versioning = true
	12	+
	13	+ # Use AES-256-GCM authenticated encryption for encrypted cookies.
	14	+ # Also, embed cookie expiry in signed or encrypted cookies for increased security.
	15	+ #
	16	+ # This option is not backwards compatible with earlier Rails versions.
	17	+ # It's best enabled when your entire app is migrated and stable on 5.2.
	18	+ #
	19	+ # Existing cookies will be converted on read then written with the new scheme.
	20	+ # Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
	21	+
	22	+ # Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
	23	+ # instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
	24	+ # Rails.application.config.active_support.use_authenticated_message_encryption = true
	25	+
	26	+ # Add default protection from forgery to ActionController::Base instead of in
	27	+ # ApplicationController.
	28	+ # Rails.application.config.action_controller.default_protect_from_forgery = true
	29	+
	30	+ # Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
	31	+ # 'f' after migrating old data.
	32	+ # Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
	33	+
	34	+ # Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
	35	+ # Rails.application.config.active_support.use_sha1_digests = true
	36	+
	37	+ # Make `form_with` generate id attributes for any generated HTML tags.
	38	+ # Rails.application.config.action_view.form_with_generates_ids = true

config/storage.yml created 644 ¶ +34

@@ -0,0 +1,34
	1	+ test:
	2	+ service: Disk
	3	+ root: <%= Rails.root.join("tmp/storage") %>
	4	+
	5	+ local:
	6	+ service: Disk
	7	+ root: <%= Rails.root.join("storage") %>
	8	+
	9	+ # Use rails credentials:edit to set the AWS secrets (as aws:access_key_id\|secret_access_key)
	10	+ # amazon:
	11	+ # service: S3
	12	+ # access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
	13	+ # secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
	14	+ # region: us-east-1
	15	+ # bucket: your_own_bucket
	16	+
	17	+ # Remember not to checkin your GCS keyfile to a repository
	18	+ # google:
	19	+ # service: GCS
	20	+ # project: your_project
	21	+ # credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
	22	+ # bucket: your_own_bucket
	23	+
	24	+ # Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
	25	+ # microsoft:
	26	+ # service: AzureStorage
	27	+ # storage_account_name: your_account_name
	28	+ # storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
	29	+ # container: your_container_name
	30	+
	31	+ # mirror:
	32	+ # service: Mirror
	33	+ # primary: local
	34	+ # mirrors: [ amazon, google, microsoft ]

Gemfile ¶ +40 -19

               source 'https://rubygems.org'
+            + git_source(:github) { |repo| "https://github.com/#{repo}.git" }
               #rails
-            - gem 'rails', '~>5.0'
+            + gem 'rails', '~>5.2'
               gem 'activerecord-session_store'
+            + gem 'puma'
+            + # Reduces boot times through caching; required in config/boot.rb
+            + gem 'bootsnap', '>= 1.1.0', require: false
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               #for dumping database into yaml
               gem 'yaml_db'
+            +
+            + #------------- assset pipeline -----------------
               # Gems used only for assets and not required
               # in production environments by default.
-            - gem 'sass-rails'
+            + #sass-rails is depricated
+            + #gem 'sass-rails'
+            + gem 'sassc-rails'
               gem 'coffee-rails'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
               gem 'haml'
               gem 'haml-rails'
-            - # gem 'prototype-rails'
-            - # To use ActiveModel has_secure_password
-            - # gem 'bcrypt-ruby', '~> 3.0.0'
-            - # To use Jbuilder templates for JSON
-            - # gem 'jbuilder'
-            - # Use unicorn as the app server
+            + # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-            - # gem 'unicorn'
+            + #gem 'turbolinks', '~> 5'
+            + # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+            + gem 'jbuilder', '~> 2.5'
-            - # Deploy with Capistrano
-            - # gem 'capistrano'
-            - # To use debugger
-            - # gem 'debugger'
-            - #
               #in-place editor
               gem 'best_in_place', '~> 3.0.1'
               #bootstrap add-ons
               gem 'bootstrap-sass', '~> 3.4.1'
-            - gem 'sassc-rails', '>= 2.1.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
               gem 'rdiscount'
               gem 'dynamic_form'
               gem 'in_place_editing'
-            - gem 'verification', :git => 'https://github.com/sikachu/verification.git'
+            + #gem 'verification', :git => 'https://github.com/sikachu/verification.git'
               #---------------- testiing -----------------------
               #---------------- for console --------------------
               gem 'fuzzy-string-match'
+            +
+            +
+            + group :development, :test do
+            +   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+            +   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+            + end
+            +
+            + group :development do
+            +   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+            +   gem 'web-console', '>= 3.3.0'
+            +   gem 'listen', '>= 3.0.5', '< 3.2'
+            +   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+            +   gem 'spring'
+            +   gem 'spring-watcher-listen', '~> 2.0.0'
+            + end
+            +
+            + group :test do
+            +   # Adds support for Capybara system testing and selenium driver
+            +   gem 'capybara', '>= 2.15'
+            +   gem 'selenium-webdriver'
+            +   # Easy installation and use of chromedriver to run system tests with Chrome
+            +   #gem 'chromedriver-helper'
+            +   gem 'webdriver'
+            + end
+            +

Gemfile.lock ¶ +108 -54

-            - GIT
-            -   remote: https://github.com/sikachu/verification.git
-            -   revision: ff31697b940d7b0e2ec65f08764215c96104e76d
-            -   specs:
-            -     verification (1.0.3)
-            -       actionpack (>= 3.0.0, < 5.1)
-            -       activesupport (>= 3.0.0, < 5.1)
               GEM
                 remote: https://rubygems.org/
                 specs:
                     ZenTest (~> 4.3)
                   ZenTest (4.11.2)
                   ace-rails-ap (4.2)
-            -     actioncable (5.0.7.2)
+            +     actioncable (5.2.3)
-            -       actionpack (= 5.0.7.2)
+            +       actionpack (= 5.2.3)
-            -       nio4r (>= 1.2, < 3.0)
+            +       nio4r (~> 2.0)
-            -       websocket-driver (~> 0.6.1)
+            +       websocket-driver (>= 0.6.1)
-            -     actionmailer (5.0.7.2)
+            +     actionmailer (5.2.3)
-            -       actionpack (= 5.0.7.2)
+            +       actionpack (= 5.2.3)
-            -       actionview (= 5.0.7.2)
+            +       actionview (= 5.2.3)
-            -       activejob (= 5.0.7.2)
+            +       activejob (= 5.2.3)
                     mail (~> 2.5, >= 2.5.4)
                     rails-dom-testing (~> 2.0)
-            -     actionpack (5.0.7.2)
+            +     actionpack (5.2.3)
-            -       actionview (= 5.0.7.2)
+            +       actionview (= 5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activesupport (= 5.2.3)
                     rack (~> 2.0)
-            -       rack-test (~> 0.6.3)
+            +       rack-test (>= 0.6.3)
                     rails-dom-testing (~> 2.0)
                     rails-html-sanitizer (~> 1.0, >= 1.0.2)
-            -     actionview (5.0.7.2)
+            +     actionview (5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activesupport (= 5.2.3)
                     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)
+            +     activejob (5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activesupport (= 5.2.3)
                     globalid (>= 0.3.6)
-            -     activemodel (5.0.7.2)
+            +     activemodel (5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activesupport (= 5.2.3)
-            -     activerecord (5.0.7.2)
+            +     activerecord (5.2.3)
-            -       activemodel (= 5.0.7.2)
+            +       activemodel (= 5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activesupport (= 5.2.3)
-            -       arel (~> 7.0)
+            +       arel (>= 9.0)
                   activerecord-session_store (1.1.3)
                     actionpack (>= 4.0)
                     activerecord (>= 4.0)
                     multi_json (~> 1.11, >= 1.11.2)
                     rack (>= 1.5.2, < 3)
                     railties (>= 4.0)
-            -     activesupport (5.0.7.2)
+            +     activestorage (5.2.3)
+            +       actionpack (= 5.2.3)
+            +       activerecord (= 5.2.3)
+            +       marcel (~> 0.3.1)
+            +     activesupport (5.2.3)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
                     i18n (>= 0.7, < 2)
                     minitest (~> 5.1)
                     tzinfo (~> 1.1)
+            +     addressable (2.6.0)
+            +       public_suffix (>= 2.0.2, < 4.0)
                   ansi (1.5.0)
-            -     arel (7.1.4)
+            +     arel (9.0.0)
                   autoprefixer-rails (9.5.1.1)
                     execjs
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
+            +     bindex (0.7.0)
+            +     bootsnap (1.4.4)
+            +       msgpack (~> 1.0)
                   bootstrap-datepicker-rails (1.8.0.1)
                     railties (>= 3.0)
                   bootstrap-sass (3.4.1)
                   bootstrap3-datetimepicker-rails (4.17.47)
                     momentjs-rails (>= 2.8.1)
                   builder (3.2.3)
+            +     byebug (11.0.1)
+            +     capybara (3.25.0)
+            +       addressable
+            +       mini_mime (>= 0.1.3)
+            +       nokogiri (~> 1.8)
+            +       rack (>= 1.6.0)
+            +       rack-test (>= 0.6.3)
+            +       regexp_parser (~> 1.5)
+            +       xpath (~> 3.2)
+            +     childprocess (1.0.1)
+            +       rake (< 13.0)
                   coffee-rails (4.2.2)
                     coffee-script (>= 2.2.0)
                     railties (>= 4.0.0)
                   concurrent-ruby (1.1.5)
                   crass (1.0.4)
                   dynamic_form (1.1.4)
+            +     erubi (1.8.0)
                   erubis (2.7.0)
                   execjs (2.7.0)
                   ffi (1.11.1)
                   i18n (1.6.0)
                     concurrent-ruby (~> 1.0)
                   in_place_editing (1.2.0)
+            +     jbuilder (2.9.1)
+            +       activesupport (>= 4.2.0)
                   jquery-countdown-rails (2.0.2)
                   jquery-datatables-rails (3.4.0)
                     actionpack (>= 3.1)
                     railties (>= 3.1)
                   jquery-ui-rails (6.0.1)
                     railties (>= 3.2.16)
+            +     listen (3.1.5)
+            +       rb-fsevent (~> 0.9, >= 0.9.4)
+            +       rb-inotify (~> 0.9, >= 0.9.7)
+            +       ruby_dep (~> 1.2)
                   loofah (2.2.3)
                     crass (~> 1.0.2)
                     nokogiri (>= 1.5.9)
                   mail (2.7.1)
                     mini_mime (>= 0.1.1)
+            +     marcel (0.3.3)
+            +       mimemagic (~> 0.3.2)
                   method_source (0.9.2)
+            +     mimemagic (0.3.3)
                   mini_mime (1.0.1)
                   mini_portile2 (2.4.0)
                   minitest (5.11.3)
                     ruby-progressbar
                   momentjs-rails (2.20.1)
                     railties (>= 3.1)
+            +     msgpack (1.3.0)
                   multi_json (1.13.1)
                   mysql2 (0.5.2)
                   nio4r (2.3.1)
                   nokogiri (1.10.3)
                     mini_portile2 (~> 2.4.0)
+            +     public_suffix (3.1.1)
+            +     puma (4.0.0)
+            +       nio4r (~> 2.0)
                   rack (2.0.7)
-            -     rack-test (0.6.3)
+            +     rack-test (1.1.0)
-            -       rack (>= 1.0)
+            +       rack (>= 1.0, < 3)
-            -     rails (5.0.7.2)
+            +     rails (5.2.3)
-            -       actioncable (= 5.0.7.2)
+            +       actioncable (= 5.2.3)
-            -       actionmailer (= 5.0.7.2)
+            +       actionmailer (= 5.2.3)
-            -       actionpack (= 5.0.7.2)
+            +       actionpack (= 5.2.3)
-            -       actionview (= 5.0.7.2)
+            +       actionview (= 5.2.3)
-            -       activejob (= 5.0.7.2)
+            +       activejob (= 5.2.3)
-            -       activemodel (= 5.0.7.2)
+            +       activemodel (= 5.2.3)
-            -       activerecord (= 5.0.7.2)
+            +       activerecord (= 5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activestorage (= 5.2.3)
+            +       activesupport (= 5.2.3)
                     bundler (>= 1.3.0)
-            -       railties (= 5.0.7.2)
+            +       railties (= 5.2.3)
                     sprockets-rails (>= 2.0.0)
                   rails-controller-testing (1.0.4)
                     actionpack (>= 5.0.1.x)
                     loofah (~> 2.2, >= 2.2.2)
                   rails_bootstrap_sortable (2.0.6)
                     momentjs-rails (>= 2.8.3)
-            -     railties (5.0.7.2)
+            +     railties (5.2.3)
-            -       actionpack (= 5.0.7.2)
+            +       actionpack (= 5.2.3)
-            -       activesupport (= 5.0.7.2)
+            +       activesupport (= 5.2.3)
                     method_source
                     rake (>= 0.8.7)
-            -       thor (>= 0.18.1, < 2.0)
+            +       thor (>= 0.19.0, < 2.0)
                   rake (12.3.2)
                   rb-fsevent (0.10.3)
                   rb-inotify (0.10.0)
                     ffi (~> 1.0)
                   rdiscount (2.2.0.1)
+            +     regexp_parser (1.5.1)
                   rouge (3.3.0)
                   ruby-progressbar (1.10.0)
+            +     ruby_dep (1.5.0)
                   ruby_parser (3.13.1)
                     sexp_processor (~> 4.9)
+            +     rubyzip (1.2.3)
                   sass (3.7.4)
                     sass-listen (~> 4.0.0)
                   sass-listen (4.0.0)
                     tilt
                   select2-rails (4.0.3)
                     thor (~> 0.14)
+            +     selenium-webdriver (3.142.3)
+            +       childprocess (>= 0.5, < 2.0)
+            +       rubyzip (~> 1.2, >= 1.2.2)
                   sexp_processor (4.12.0)
+            +     spring (2.1.0)
+            +     spring-watcher-listen (2.0.1)
+            +       listen (>= 2.7, < 4.0)
+            +       spring (>= 1.2, < 3.0)
                   sprockets (3.7.2)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                     thread_safe (~> 0.1)
                   uglifier (4.1.20)
                     execjs (>= 0.3.0, < 3)
-            -     websocket-driver (0.6.5)
+            +     web-console (3.7.0)
+            +       actionview (>= 5.0)
+            +       activemodel (>= 5.0)
+            +       bindex (>= 0.4.0)
+            +       railties (>= 5.0)
+            +     webdriver (0.1.0)
+            +     websocket-driver (0.7.1)
                     websocket-extensions (>= 0.1.0)
                   websocket-extensions (0.1.4)
                   will_paginate (3.0.12)
+            +     xpath (3.2.0)
+            +       nokogiri (~> 1.8)
                   yaml_db (0.7.0)
                     rails (>= 3.0)
                     rake (>= 0.8.7)
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
+            +   bootsnap (>= 1.1.0)
                 bootstrap-datepicker-rails
                 bootstrap-sass (~> 3.4.1)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 bootstrap3-datetimepicker-rails
+            +   byebug
+            +   capybara (>= 2.15)
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing
+            +   jbuilder (~> 2.5)
                 jquery-countdown-rails
                 jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
+            +   listen (>= 3.0.5, < 3.2)
                 mail
                 minitest-reporters
                 momentjs-rails
                 mysql2
-            -   rails (~> 5.0)
+            +   puma
+            +   rails (~> 5.2)
                 rails-controller-testing
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
-            -   sass-rails
+            +   sassc-rails
-            -   sassc-rails (>= 2.1.0)
                 select2-rails
+            +   selenium-webdriver
+            +   spring
+            +   spring-watcher-listen (~> 2.0.0)
                 sqlite3
                 uglifier
-            -   verification!
+            +   web-console (>= 3.3.0)
+            +   webdriver
                 will_paginate (~> 3.0.7)
                 yaml_db

bin/bundle ¶ +1 -1

               #!/usr/bin/env ruby
-            - ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+            + ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
               load Gem.bin_path('bundler', 'bundle')

bin/setup ¶ +4 -2

               #!/usr/bin/env ruby
-            - require 'pathname'
               require 'fileutils'
               include 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 ==")
                 system! 'gem install bundler --conservative'
                 system('bundle check') || system!('bundle install')
+            +   # Install JavaScript dependencies if using Yarn
+            +   # system('bin/yarn')
+            +
                 # puts "\n== Copying sample files =="
                 # unless File.exist?('config/database.yml')
                 #   cp 'config/database.yml.sample', 'config/database.yml'

bin/update ¶ +4 -2

               #!/usr/bin/env ruby
-            - require 'pathname'
               require 'fileutils'
               include 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 ==")
                 system! 'gem install bundler --conservative'
                 system('bundle check') || system!('bundle install')
+            +   # Install JavaScript dependencies if using Yarn
+            +   # system('bin/yarn')
+            +
                 puts "\n== Updating database =="
                 system! 'bin/rails db:migrate'

config/boot.rb ¶ +1

               ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
               require 'bundler/setup' # Set up gems listed in the Gemfile.
+            + require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

config/cable.yml ¶ +2 -1

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

config/environments/development.rb ¶ +10 -3

                 config.consider_all_requests_local = 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.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.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
                 # 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.
                 # 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
+            +   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
               end

config/environments/production.rb ¶ +8

                 config.consider_all_requests_local       = false
                 config.action_controller.perform_caching = true
+            +   # 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?
                 # 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)
+            +   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'
                 # 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.action_mailer.perform_caching = false
                 # Ignore bad email addresses and do not raise email delivery errors.

config/environments/test.rb ¶ +5 -1

                 # 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.
                 # 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
+            +   config.active_storage.service = :test
+            +
                 config.action_mailer.perform_caching = false
                 # Tell Action Mailer not to deliver emails to the real world.

config/initializers/assets.rb ¶ +7 -3

               # 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
+            + # Add Yarn node_modules folder to the asset load path.
+            + Rails.application.config.assets.paths << Rails.root.join('node_modules')
               # Precompile additional assets.
-            - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+            + # application.js, application.css, and all non-JS/CSS in the app/assets
-            - # Rails.application.config.assets.precompile += %w( search.js )
+            + # folder are already added.
+            + # Rails.application.config.assets.precompile += %w( admin.js admin.css )
               Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
               Rails.application.config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
               %w( announcements submissions configurations contests contest_management graders heartbeat
                   test user_admin users tags testcases).each do |controller|
                 Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
               end
+            +

config/initializers/cookies_serializer.rb ¶ +1 -1

               # Specify a serializer for the signed and encrypted cookie jars.
               # Valid options are :json, :marshal, and :hybrid.
-            - Rails.application.config.action_dispatch.cookies_serializer = :marshal
+            + Rails.application.config.action_dispatch.cookies_serializer = :json

config/puma.rb ¶ +5 -18

               # 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_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
               threads threads_count, threads_count
-            - # Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+            + # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
               #
               port        ENV.fetch("PORT") { 3000 }
               # 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
+            + # process behavior so workers use less memory.
-            - # you need to make sure to reconnect any threads in the `on_worker_boot`
-            - # block.
               #
               # 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

config/routes.rb ¶ +1 -1

-            - CafeGrader::Application.routes.draw do
+            + Rails.application.routes.draw do
                 resources :tags
                 get "sources/direct_edit"

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

r750:d729ef9d227c - Thu, 04 Jul 2019 05:55:10 - 18 files changed: 305 inserted, 106 deleted

Sign in to your account

Commit r750:d729ef9d227c public

Author

r750:d729ef9d227c - Thu, 04 Jul 2019 05:55:10 - 18 files changed: 305 inserted, 106 deleted

Commit `r750:d729ef9d227c` public