cafe-grader-web Commit - r820:0b2fef7e1246

cafe-grader-web

Commit `r820:0b2fef7e1246` public

parent | child

Description:

move to rails 7 and ruby 3.0.2

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

r820:0b2fef7e1246 - Sat, 15 Jan 2022 06:12:18 - 14 files changed: 311 inserted, 174 deleted

config/initializers/new_framework_defaults_7_0.rb created 644 ¶ +117

@@ -0,0 +1,117
	1	+ # Be sure to restart your server when you modify this file.
	2	+ #
	3	+ # This file eases your Rails 7.0 framework defaults upgrade.
	4	+ #
	5	+ # Uncomment each configuration one by one to switch to the new default.
	6	+ # Once your application is ready to run with all new defaults, you can remove
	7	+ # this file and set the `config.load_defaults` to `7.0`.
	8	+ #
	9	+ # Read the Guide for Upgrading Ruby on Rails for more info on each option.
	10	+ # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
	11	+
	12	+ # `button_to` view helper will render `<button>` element, regardless of whether
	13	+ # or not the content is passed as the first argument or as a block.
	14	+ # Rails.application.config.action_view.button_to_generates_button_tag = true
	15	+
	16	+ # `stylesheet_link_tag` view helper will not render the media attribute by default.
	17	+ # Rails.application.config.action_view.apply_stylesheet_media_default = false
	18	+
	19	+ # Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
	20	+ # Changing this default means invalidate all encrypted messages generated by
	21	+ # your application and, all the encrypted cookies. Only change this after you
	22	+ # rotated all the messages using the key rotator.
	23	+ #
	24	+ # See upgrading guide for more information on how to build a rotator.
	25	+ # https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
	26	+ # Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
	27	+
	28	+ # Change the digest class for ActiveSupport::Digest.
	29	+ # Changing this default means that for example Etags change and
	30	+ # various cache keys leading to cache invalidation.
	31	+ # Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
	32	+
	33	+ # Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
	34	+ # implementation.
	35	+ # Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
	36	+
	37	+ # Change the format of the cache entry.
	38	+ # Changing this default means that all new cache entries added to the cache
	39	+ # will have a different format that is not supported by Rails 6.1 applications.
	40	+ # Only change this value after your application is fully deployed to Rails 7.0
	41	+ # and you have no plans to rollback.
	42	+ # Rails.application.config.active_support.cache_format_version = 7.0
	43	+
	44	+ # Calls `Rails.application.executor.wrap` around test cases.
	45	+ # This makes test cases behave closer to an actual request or job.
	46	+ # Several features that are normally disabled in test, such as Active Record query cache
	47	+ # and asynchronous queries will then be enabled.
	48	+ # Rails.application.config.active_support.executor_around_test_case = true
	49	+
	50	+ # Define the isolation level of most of Rails internal state.
	51	+ # If you use a fiber based server or job processor, you should set it to `:fiber`.
	52	+ # Otherwise the default of `:thread` if preferable.
	53	+ # Rails.application.config.active_support.isolation_level = :thread
	54	+
	55	+ # Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
	56	+ # Rails.application.config.action_mailer.smtp_timeout = 5
	57	+
	58	+ # The ActiveStorage video previewer will now use scene change detection to generate
	59	+ # better preview images (rather than the previous default of using the first frame
	60	+ # of the video).
	61	+ # Rails.application.config.active_storage.video_preview_arguments =
	62	+ # "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
	63	+
	64	+ # Automatically infer `inverse_of` for associations with a scope.
	65	+ # Rails.application.config.active_record.automatic_scope_inversing = true
	66	+
	67	+ # Raise when running tests if fixtures contained foreign key violations
	68	+ # Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
	69	+
	70	+ # Disable partial inserts.
	71	+ # This default means that all columns will be referenced in INSERT queries
	72	+ # regardless of whether they have a default or not.
	73	+ # Rails.application.config.active_record.partial_inserts = false
	74	+ #
	75	+ # Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
	76	+ # Rails.application.config.action_controller.raise_on_open_redirects = true
	77	+
	78	+ # Change the variant processor for Active Storage.
	79	+ # Changing this default means updating all places in your code that
	80	+ # generate variants to use image processing macros and ruby-vips
	81	+ # operations. See the upgrading guide for detail on the changes required.
	82	+ # The `:mini_magick` option is not deprecated; it's fine to keep using it.
	83	+ # Rails.application.config.active_storage.variant_processor = :vips
	84	+
	85	+ # If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
	86	+ # was `:marshal`. Convert all cookies to JSON, using the `:hybrid` formatter.
	87	+ #
	88	+ # If you're confident all your cookies are JSON formatted, you can switch to the `:json` formatter.
	89	+ #
	90	+ # Continue to use `:marshal` for backward-compatibility with old cookies.
	91	+ #
	92	+ # If you have configured the serializer elsewhere, you can remove this.
	93	+ #
	94	+ # See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
	95	+ # Rails.application.config.action_dispatch.cookies_serializer = :hybrid
	96	+
	97	+ # Enable parameter wrapping for JSON.
	98	+ # Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
	99	+ # To disable parameter wrapping entirely, set this config to `false`.
	100	+ # Rails.application.config.action_controller.wrap_parameters_by_default = true
	101	+
	102	+ # Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
	103	+ # `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
	104	+ #
	105	+ # See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
	106	+ # more information.
	107	+ # Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
	108	+
	109	+ # Change the default headers to disable browsers' flawed legacy XSS protection.
	110	+ # Rails.application.config.action_dispatch.default_headers = {
	111	+ # "X-Frame-Options" => "SAMEORIGIN",
	112	+ # "X-XSS-Protection" => "0",
	113	+ # "X-Content-Type-Options" => "nosniff",
	114	+ # "X-Download-Options" => "noopen",
	115	+ # "X-Permitted-Cross-Domain-Policies" => "none",
	116	+ # "Referrer-Policy" => "strict-origin-when-cross-origin"
	117	+ # }

.ruby-version ¶ +1 -1

	@@ -1,1 +1,1
	1	- ruby-~~2.6.3~~		1	+ ruby-3.0.2

Gemfile ¶ +16 -9

               source 'https://rubygems.org'
               git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+            + ruby '3.0.2'
+            +
               #rails
-            - gem 'rails', '~>6.0'
+            + gem 'rails', '~>7.0'
+            +
+            + # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+            + gem "sprockets-rails"
+            +
               gem 'activerecord-session_store'
               gem 'puma'
               # Reduces boot times through caching; required in config/boot.rb
-            - gem 'bootsnap', '>= 1.1.0', require: false
+            + gem 'bootsnap', require: false
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               #---------------- database ---------------------
               #the database
               gem 'haml'
               gem 'haml-rails'
               # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
               #gem 'turbolinks', '~> 5'
               # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-            - gem 'jbuilder', '~> 2.5'
+            + gem 'jbuilder'
               #in-place editor
-            - gem 'best_in_place', '~> 3.0.1'
+            + gem 'best_in_place', git: "https://github.com/mmotherwell/best_in_place"
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-rails'
               #gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               #---------------- 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]
+            +   gem 'debug', 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'
+            +
+            +   # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
+            +   # gem "rack-mini-profiler"
               end
               group :test do
                 # Adds support for Capybara system testing and selenium driver
-            -   gem 'capybara', '>= 2.15'
+            +   gem 'capybara'
                 gem 'selenium-webdriver'
-            -   # Easy installation and use of chromedriver to run system tests with Chrome
+            +   gem 'webdrivers'
-            -   #gem 'chromedriver-helper'
-            -   gem 'webdriver'
               end

Gemfile.lock ¶ +118 -78

+            + GIT
+            +   remote: https://github.com/mmotherwell/best_in_place
+            +   revision: 88eb3052623a9a6cd346864d2aca05021c2f80d0
+            +   specs:
+            +     best_in_place (3.1.1)
+            +       actionpack (>= 3.2)
+            +       railties (>= 3.2)
+            +
               GEM
                 remote: https://rubygems.org/
                 specs:
                   RubyInline (3.12.5)
                     ZenTest (~> 4.3)
                   ZenTest (4.12.0)
                   ace-rails-ap (4.4)
-            -     actioncable (6.1.4.4)
+            +     actioncable (7.0.1)
-            -       actionpack (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                     nio4r (~> 2.0)
                     websocket-driver (>= 0.6.1)
-            -     actionmailbox (6.1.4.4)
+            +     actionmailbox (7.0.1)
-            -       actionpack (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
-            -       activejob (= 6.1.4.4)
+            +       activejob (= 7.0.1)
-            -       activerecord (= 6.1.4.4)
+            +       activerecord (= 7.0.1)
-            -       activestorage (= 6.1.4.4)
+            +       activestorage (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                     mail (>= 2.7.1)
-            -     actionmailer (6.1.4.4)
+            +       net-imap
-            -       actionpack (= 6.1.4.4)
+            +       net-pop
-            -       actionview (= 6.1.4.4)
+            +       net-smtp
-            -       activejob (= 6.1.4.4)
+            +     actionmailer (7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
+            +       actionview (= 7.0.1)
+            +       activejob (= 7.0.1)
+            +       activesupport (= 7.0.1)
                     mail (~> 2.5, >= 2.5.4)
+            +       net-imap
+            +       net-pop
+            +       net-smtp
                     rails-dom-testing (~> 2.0)
-            -     actionpack (6.1.4.4)
+            +     actionpack (7.0.1)
-            -       actionview (= 6.1.4.4)
+            +       actionview (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
-            -       rack (~> 2.0, >= 2.0.9)
+            +       rack (~> 2.0, >= 2.2.0)
                     rack-test (>= 0.6.3)
                     rails-dom-testing (~> 2.0)
                     rails-html-sanitizer (~> 1.0, >= 1.2.0)
-            -     actiontext (6.1.4.4)
+            +     actiontext (7.0.1)
-            -       actionpack (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
-            -       activerecord (= 6.1.4.4)
+            +       activerecord (= 7.0.1)
-            -       activestorage (= 6.1.4.4)
+            +       activestorage (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
+            +       globalid (>= 0.6.0)
                     nokogiri (>= 1.8.5)
-            -     actionview (6.1.4.4)
+            +     actionview (7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                     builder (~> 3.1)
                     erubi (~> 1.4)
                     rails-dom-testing (~> 2.0)
                     rails-html-sanitizer (~> 1.1, >= 1.2.0)
-            -     activejob (6.1.4.4)
+            +     activejob (7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                     globalid (>= 0.3.6)
-            -     activemodel (6.1.4.4)
+            +     activemodel (7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
-            -     activerecord (6.1.4.4)
+            +     activerecord (7.0.1)
-            -       activemodel (= 6.1.4.4)
+            +       activemodel (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                   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 (6.1.4.4)
+            +     activestorage (7.0.1)
-            -       actionpack (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
-            -       activejob (= 6.1.4.4)
+            +       activejob (= 7.0.1)
-            -       activerecord (= 6.1.4.4)
+            +       activerecord (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
-            -       marcel (~> 1.0.0)
+            +       marcel (~> 1.0)
                     mini_mime (>= 1.1.0)
-            -     activesupport (6.1.4.4)
+            +     activesupport (7.0.1)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
                     i18n (>= 1.6, < 2)
                     minitest (>= 5.1)
                     tzinfo (~> 2.0)
-            -       zeitwerk (~> 2.3)
                   addressable (2.8.0)
                     public_suffix (>= 2.0.2, < 5.0)
                   ansi (1.5.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)
                   bootsnap (1.9.4)
                     msgpack (~> 1.0)
                   bootstrap-sass (3.4.1)
                     autoprefixer-rails (>= 5.2.1)
                     sassc (>= 2.0.0)
                   bootstrap-switch-rails (3.3.5)
                   bootstrap-toggle-rails (2.2.1.0)
                   bootstrap3-datetimepicker-rails (4.17.47)
                     momentjs-rails (>= 2.8.1)
                   builder (3.2.4)
-            -     byebug (11.1.3)
                   capybara (3.36.0)
                     addressable
                     matrix
                     mini_mime (>= 0.1.3)
                     nokogiri (~> 1.8)
                     rack (>= 1.6.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.1.9)
                   crass (1.0.6)
+            +     debug (1.4.0)
+            +       irb (>= 1.3.6)
+            +       reline (>= 0.2.7)
+            +     digest (3.1.0)
                   dynamic_form (1.1.4)
                   erubi (1.10.0)
                   erubis (2.7.0)
                   execjs (2.8.1)
                   ffi (1.15.5)
                   fuzzy-string-match (1.0.1)
                     haml (>= 4.0, < 6)
                     nokogiri (>= 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (1.8.11)
                     concurrent-ruby (~> 1.0)
                   in_place_editing (1.2.0)
+            +     io-console (0.5.11)
+            +     io-wait (0.2.1)
+            +     irb (1.4.1)
+            +       reline (>= 0.3.0)
                   jbuilder (2.11.5)
                     actionview (>= 5.0.0)
                     activesupport (>= 5.0.0)
                   jquery-countdown-rails (2.0.2)
                   jquery-rails (4.4.0)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.27.2)
                     railties (>= 3.2)
                   jquery-ui-rails (6.0.1)
                     railties (>= 3.2.16)
-            -     listen (3.1.5)
+            +     listen (3.0.8)
                     rb-fsevent (~> 0.9, >= 0.9.4)
                     rb-inotify (~> 0.9, >= 0.9.7)
-            -       ruby_dep (~> 1.2)
                   loofah (2.13.0)
                     crass (~> 1.0.2)
                     nokogiri (>= 1.5.9)
                   mail (2.7.1)
                     mini_mime (>= 0.1.1)
                   marcel (1.0.2)
                   matrix (0.4.2)
                   method_source (1.0.0)
                   mini_mime (1.1.2)
-            -     mini_portile2 (2.7.1)
                   minitest (5.15.0)
                   minitest-reporters (1.4.3)
                     ansi
                     builder
                     minitest (>= 5.0)
                     ruby-progressbar
                   momentjs-rails (2.29.1.1)
                     railties (>= 3.1)
                   msgpack (1.4.2)
                   multi_json (1.15.0)
                   mysql2 (0.5.3)
+            +     net-imap (0.2.3)
+            +       digest
+            +       net-protocol
+            +       strscan
+            +     net-pop (0.1.1)
+            +       digest
+            +       net-protocol
+            +       timeout
+            +     net-protocol (0.1.2)
+            +       io-wait
+            +       timeout
+            +     net-smtp (0.3.1)
+            +       digest
+            +       net-protocol
+            +       timeout
                   nio4r (2.5.8)
-            -     nokogiri (1.13.1)
+            +     nokogiri (1.13.1-x86_64-linux)
-            -       mini_portile2 (~> 2.7.0)
                     racc (~> 1.4)
                   public_suffix (4.0.6)
                   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 (6.1.4.4)
+            +     rails (7.0.1)
-            -       actioncable (= 6.1.4.4)
+            +       actioncable (= 7.0.1)
-            -       actionmailbox (= 6.1.4.4)
+            +       actionmailbox (= 7.0.1)
-            -       actionmailer (= 6.1.4.4)
+            +       actionmailer (= 7.0.1)
-            -       actionpack (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
-            -       actiontext (= 6.1.4.4)
+            +       actiontext (= 7.0.1)
-            -       actionview (= 6.1.4.4)
+            +       actionview (= 7.0.1)
-            -       activejob (= 6.1.4.4)
+            +       activejob (= 7.0.1)
-            -       activemodel (= 6.1.4.4)
+            +       activemodel (= 7.0.1)
-            -       activerecord (= 6.1.4.4)
+            +       activerecord (= 7.0.1)
-            -       activestorage (= 6.1.4.4)
+            +       activestorage (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                     bundler (>= 1.15.0)
-            -       railties (= 6.1.4.4)
+            +       railties (= 7.0.1)
-            -       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 (6.1.4.4)
+            +     railties (7.0.1)
-            -       actionpack (= 6.1.4.4)
+            +       actionpack (= 7.0.1)
-            -       activesupport (= 6.1.4.4)
+            +       activesupport (= 7.0.1)
                     method_source
-            -       rake (>= 0.13)
+            +       rake (>= 12.2)
                     thor (~> 1.0)
+            +       zeitwerk (~> 2.5)
                   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)
+            +     reline (0.3.1)
+            +       io-console (~> 0.5)
                   rexml (3.2.5)
                   rouge (3.27.0)
                   ruby-progressbar (1.11.0)
-            -     ruby_dep (1.5.0)
                   ruby_parser (3.18.1)
                     sexp_processor (~> 4.16)
                   rubyzip (2.3.2)
                   sassc (2.4.0)
                     ffi (~> 1.9)
                   sassc-rails (2.1.2)
                     rack (> 1, < 3)
                   sprockets-rails (3.4.2)
                     actionpack (>= 5.2)
                     activesupport (>= 5.2)
                     sprockets (>= 3.0.0)
                   sqlite3 (1.4.2)
+            +     strscan (3.0.1)
                   temple (0.8.2)
                   thor (1.2.1)
                   tilt (2.0.10)
+            +     timeout (0.2.0)
                   tzinfo (2.0.4)
                     concurrent-ruby (~> 1.0)
                   uglifier (4.2.0)
                     execjs (>= 0.3.0, < 3)
                   web-console (4.2.0)
                     actionview (>= 6.0.0)
                     activemodel (>= 6.0.0)
                     bindex (>= 0.4.0)
                     railties (>= 6.0.0)
-            -     webdriver (0.19.0)
+            +     webdrivers (5.0.0)
+            +       nokogiri (~> 1.6)
+            +       rubyzip (>= 1.3.0)
+            +       selenium-webdriver (~> 4.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
+            +   x86_64-linux
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
-            -   best_in_place (~> 3.0.1)
+            +   best_in_place!
-            -   bootsnap (>= 1.1.0)
+            +   bootsnap
                 bootstrap-sass (~> 3.4.1)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 bootstrap3-datetimepicker-rails (~> 4.17.47)
-            -   byebug
+            +   capybara
-            -   capybara (>= 2.15)
                 coffee-rails
+            +   debug
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing
-            -   jbuilder (~> 2.5)
+            +   jbuilder
                 jquery-countdown-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-ui-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 minitest-reporters
                 momentjs-rails (>= 2.9.0)
                 mysql2
                 puma
-            -   rails (~> 6.0)
+            +   rails (~> 7.0)
                 rails-controller-testing
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 sassc-rails
                 select2-rails
                 selenium-webdriver
                 simple_form
                 spring
                 spring-watcher-listen (~> 2.0.0)
+            +   sprockets-rails
                 sqlite3
                 uglifier
                 web-console (>= 3.3.0)
-            -   webdriver
+            +   webdrivers
                 yaml_db
+            + RUBY VERSION
+            +    ruby 3.0.2p107
+            +
               BUNDLED WITH
-            -    1.17.2
+            +    2.3.5

bin/rails ¶ +1 -2

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

bin/rake ¶ -1

               #!/usr/bin/env ruby
-            - load File.expand_path("spring", __dir__)
               require_relative "../config/boot"
               require "rake"
               Rake.application.run

bin/setup ¶ +9 -12

               #!/usr/bin/env ruby
               require "fileutils"
               # path to your application root.
-            - APP_ROOT = File.expand_path('..', __dir__)
+            + APP_ROOT = File.expand_path("..", __dir__)
               def system!(*args)
                 system(*args) || abort("\n== Command #{args} failed ==")
               end
               FileUtils.chdir APP_ROOT do
                 # This script is a way to set up or update your development environment automatically.
                 # This script is idempotent, so that you can run it at any time and get an expectable outcome.
                 # Add necessary setup steps to this file.
-            -   puts '== Installing dependencies =='
+            +   puts "== Installing dependencies =="
-            -   system! 'gem install bundler --conservative'
+            +   system! "gem install bundler --conservative"
-            -   system('bundle check') || system!('bundle install')
+            +   system("bundle check") || system!("bundle install")
-            -   # Install JavaScript dependencies
-            -   system! 'bin/yarn'
                 # puts "\n== Copying sample files =="
-            -   # unless File.exist?('config/database.yml')
+            +   # unless File.exist?("config/database.yml")
-            -   #   FileUtils.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:prepare'
+            +   system! "bin/rails db:prepare"
                 puts "\n== Removing old logs and tempfiles =="
-            -   system! 'bin/rails log:clear tmp:clear'
+            +   system! "bin/rails log:clear tmp:clear"
                 puts "\n== Restarting application server =="
-            -   system! 'bin/rails restart'
+            +   system! "bin/rails restart"
               end

config/boot.rb ¶ +1 -1

-            - ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+            + 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/environments/development.rb ¶ +7 -6

+            + require "active_support/core_ext/integer/time"
+            +
               Rails.application.configure do
                 # Settings specified here will take precedence over those in config/application.rb.
                 # In the development environment your application's code is reloaded any time
                 # it changes. This slows down response time but is perfect for development
                 # since you don't have to restart the web server when you make code changes.
                 # Do not eager load code on boot.
                 config.eager_load = false
                 # Show full error reports.
                 config.consider_all_requests_local = true
+            +   # Enable server timing
+            +   config.server_timing = 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?
+            +   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}"
+            +       "Cache-Control" => "public, max-age=#{2.days.to_i}"
                   }
                 else
                   config.action_controller.perform_caching = false
                   config.cache_store = :null_store
                 end
                 # Raises error for missing translations.
                 # config.i18n.raise_on_missing_translations = true
                 # Annotate rendered view with file names.
                 # config.action_view.annotate_rendered_view_with_filenames = true
-            -   # Use an evented file watcher to asynchronously detect changes in source code,
-            -   # routes, locales, etc. This feature depends on the listen gem.
-            -   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
                 # Uncomment if you wish to allow Action Cable access from any origin.
                 # config.action_cable.disable_request_forgery_protection = true
               end

config/environments/production.rb ¶ +10 -29

+            + require "active_support/core_ext/integer/time"
+            +
               Rails.application.configure do
                 # Settings specified here will take precedence over those in config/application.rb.
                 # Code is not reloaded between requests.
                 config.cache_classes = 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.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
                 # Compress CSS using a preprocessor.
                 # config.assets.css_compressor = :sass
                 # Do not fallback to assets pipeline if a precompiled asset is missed.
                 config.assets.compile = false
                 # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-            -   # config.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-Sendfile" # for Apache
-            -   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+            +   # 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'
+            +   # config.action_cable.url = "wss://example.com/cable"
-            -   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+            +   # 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
                 # Include generic and useful information about system operation, but avoid logging too much
                 # information to avoid inadvertent exposure of personally identifiable information (PII).
                 config.active_support.disallowed_deprecation_warnings = []
                 # Use default logging formatter so that PID and timestamp are not suppressed.
                 config.log_formatter = ::Logger::Formatter.new
                 # Use a different logger for distributed setups.
-            -   # require 'syslog/logger'
+            +   # require "syslog/logger"
-            -   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+            +   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
                 if ENV["RAILS_LOG_TO_STDOUT"].present?
                   logger           = ActiveSupport::Logger.new(STDOUT)
                   logger.formatter = config.log_formatter
                   config.logger    = ActiveSupport::TaggedLogging.new(logger)
                 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 ¶ +7 -7

               # your test database is "scratch space" for the test suite and is wiped
               # and recreated between test runs. Don't rely on the data there!
               Rails.application.configure do
                 # Settings specified here will take precedence over those in config/application.rb.
-            -   config.cache_classes = false
+            +   # Turn false under Spring and add config.action_view.cache_template_loading = true.
-            -   config.action_view.cache_template_loading = true
+            +   config.cache_classes = true
-            -   # Do not eager load code on boot. This avoids loading your whole application
+            +   # Eager loading loads your whole application. When running a single test locally,
-            -   # just for the purpose of running a single test. If you are using a tool that
+            +   # this probably isn't necessary. It's a good idea to do in a continuous integration
-            -   # preloads Rails for running tests, you may have to set it to true.
+            +   # system, or in some way before deploying your code.
-            -   config.eager_load = false
+            +   config.eager_load = ENV["CI"].present?
                 # 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=#{1.hour.to_i}"
+            +     "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

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

               # Be sure to restart your server when you modify this file.
               # Version of your assets, change this if you want to expire all your assets.
-            - Rails.application.config.assets.version = '1.0'
+            + Rails.application.config.assets.version = "1.0"
               # 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')

config/initializers/content_security_policy.rb ¶ +19 -23

@@ -1,30 +1,26
1	# Be sure to restart your server when you modify this file.	1	# Be sure to restart your server when you modify this file.
2		2
3	# Define an application-wide content security policy	3	# Define an application-wide content security policy
4	# For further information see the following documentation	4	# For further information see the following documentation
5	# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy	5	# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
6		6
7	- # Rails.application.config~~.content_security_policy do \|policy\|~~	7	+ # Rails.application.configure do
8	- # policy.default_src :self, :https	8	+ # config.content_security_policy do \|policy\|
9	- # policy.~~fon~~t_src :self, :https~~, :data~~	9	+ # policy.default_src :self, :https
10	- # policy.~~img_src~~ :self, :https, :data	10	+ # policy.font_src :self, :https, :data
11	- # policy.object_src :none	11	+ # policy.img_src :self, :https, :data
12	- # policy.~~script_src :self, :https~~	12	+ # policy.object_src :none
13	- # policy.st~~yle~~_src :self, :https	13	+ # policy.script_src :self, :https
14	- # # If you are using webpack-dev-server then specify webpack-dev-server host	14	+ # policy.style_src :self, :https
15	- # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?	15	+ # # Specify URI for violation reports
16	-	16	+ # # policy.report_uri "/csp-violation-report-endpoint"
17	- # # Specify URI for violation reports	17	+ # end
18	- # # policy.report_uri "/csp-violation-report-endpoint"	18	+ #
		19	+ # # Generate session nonces for permitted importmap and inline scripts
		20	+ # config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
		21	+ # config.content_security_policy_nonce_directives = %w(script-src)
		22	+ #
		23	+ # # Report CSP violations to a specified URI. See:
		24	+ # # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
		25	+ # # config.content_security_policy_report_only = true
19	# end	26	# end
20	-
21	- # If you are using UJS then enable automatic nonce generation
22	- # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
23	-
24	- # Set the nonce only to specific directives
25	- # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
26	-
27	- # Report CSP violations to a specified URI
28	- # For further information see the following documentation:
29	- # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
30	- # Rails.application.config.content_security_policy_report_only = true

config/initializers/inflections.rb ¶ +4 -4

               # Be sure to restart your server when you modify this file.
               # Add new inflection rules using the following format. Inflections
               # are locale specific, and you may define rules for as many different
               # locales as you wish. All of these examples are active by default:
               # ActiveSupport::Inflector.inflections(:en) do |inflect|
-            - #   inflect.plural /^(ox)$/i, '\1en'
+            + #   inflect.plural /^(ox)$/i, "\\1en"
-            - #   inflect.singular /^(ox)en/i, '\1'
+            + #   inflect.singular /^(ox)en/i, "\\1"
-            - #   inflect.irregular 'person', 'people'
+            + #   inflect.irregular "person", "people"
               #   inflect.uncountable %w( fish sheep )
               # end
               # These inflection rules are supported but not enabled by default:
               # ActiveSupport::Inflector.inflections(:en) do |inflect|
-            - #   inflect.acronym 'RESTful'
+            + #   inflect.acronym "RESTful"
               # end

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

r820:0b2fef7e1246 - Sat, 15 Jan 2022 06:12:18 - 14 files changed: 311 inserted, 174 deleted

Sign in to your account

Commit r820:0b2fef7e1246 public

Author

r820:0b2fef7e1246 - Sat, 15 Jan 2022 06:12:18 - 14 files changed: 311 inserted, 174 deleted

Commit `r820:0b2fef7e1246` public