From 2eb4025486f60e728dce73305fbc7e8fc5c7461e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 09:27:26 +0000 Subject: [PATCH 1/2] Bump rails from 5.2.4.3 to 6.0.3.2 Bumps [rails](https://github.com/rails/rails) from 5.2.4.3 to 6.0.3.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.4.3...v6.0.3.2) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 100 +++++++++++++++++++++++++++++---------------------- 2 files changed, 59 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index 221e9fb4..b7e6f710 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.2.4' +gem 'rails', '~> 6.0.3' gem 'sassc-rails', '~> 2.1.2' gem 'coffee-rails', '~> 5.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0126714c..36556806 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,57 +11,70 @@ GEM RedCloth (4.3.2) aasm (4.12.3) concurrent-ruby (~> 1.0) - actioncable (5.2.4.3) - actionpack (= 5.2.4.3) + actioncable (6.0.3.2) + actionpack (= 6.0.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) + actionmailbox (6.0.3.2) + actionpack (= 6.0.3.2) + activejob (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) + mail (>= 2.7.1) + actionmailer (6.0.3.2) + actionpack (= 6.0.3.2) + actionview (= 6.0.3.2) + activejob (= 6.0.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.3) - actionview (= 5.2.4.3) - activesupport (= 5.2.4.3) + actionpack (6.0.3.2) + actionview (= 6.0.3.2) + activesupport (= 6.0.3.2) rack (~> 2.0, >= 2.0.8) 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) actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.4.3) - activesupport (= 5.2.4.3) + actiontext (6.0.3.2) + actionpack (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) + nokogiri (>= 1.8.5) + actionview (6.0.3.2) + activesupport (= 6.0.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.3) - activesupport (= 5.2.4.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.2) + activesupport (= 6.0.3.2) globalid (>= 0.3.6) - activemodel (5.2.4.3) - activesupport (= 5.2.4.3) + activemodel (6.0.3.2) + activesupport (= 6.0.3.2) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.4.3) - activemodel (= 5.2.4.3) - activesupport (= 5.2.4.3) - arel (>= 9.0) - activestorage (5.2.4.3) - actionpack (= 5.2.4.3) - activerecord (= 5.2.4.3) + activerecord (6.0.3.2) + activemodel (= 6.0.3.2) + activesupport (= 6.0.3.2) + activestorage (6.0.3.2) + actionpack (= 6.0.3.2) + activejob (= 6.0.3.2) + activerecord (= 6.0.3.2) marcel (~> 0.3.1) - activesupport (5.2.4.3) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) acts_as_list (1.0.1) activerecord (>= 4.2) - arel (9.0.0) ast (2.4.1) autoprefixer-rails (9.4.7) execjs @@ -159,18 +172,20 @@ GEM rack (>= 1.2.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.3) - actioncable (= 5.2.4.3) - actionmailer (= 5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) - activemodel (= 5.2.4.3) - activerecord (= 5.2.4.3) - activestorage (= 5.2.4.3) - activesupport (= 5.2.4.3) + rails (6.0.3.2) + actioncable (= 6.0.3.2) + actionmailbox (= 6.0.3.2) + actionmailer (= 6.0.3.2) + actionpack (= 6.0.3.2) + actiontext (= 6.0.3.2) + actionview (= 6.0.3.2) + activejob (= 6.0.3.2) + activemodel (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) bundler (>= 1.3.0) - railties (= 5.2.4.3) + railties (= 6.0.3.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -183,12 +198,12 @@ GEM loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - railties (5.2.4.3) - actionpack (= 5.2.4.3) - activesupport (= 5.2.4.3) + railties (6.0.3.2) + actionpack (= 6.0.3.2) + activesupport (= 6.0.3.2) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.1) rb-fsevent (0.10.4) @@ -282,6 +297,7 @@ GEM websocket-extensions (0.1.5) will_paginate (3.3.0) yard (0.9.25) + zeitwerk (2.4.0) PLATFORMS ruby @@ -312,7 +328,7 @@ DEPENDENCIES paperclip puma (~> 4.3) rack-mini-profiler - rails (~> 5.2.4) + rails (~> 6.0.3) rails-controller-testing rails-dom-testing (~> 2.0.0) rails_autolink From 7c8fe5c9bebafee27b657ba4e5c8fc20d9eeedd8 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Thu, 20 Aug 2020 14:07:45 +0300 Subject: [PATCH 2/2] Whitespace changes --- config/secrets.yml | 4 ++-- config/site.yml.tmpl | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index c2dfb2e5..17a7e526 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -19,10 +19,10 @@ development: secret_key_base: <%= SITE_CONFIG["secret_token"] || SecureRandom.hex(64) %> - + test: secret_key_base: <%= SITE_CONFIG["secret_token"] || SecureRandom.hex(64) %> - + # Do not keep production secrets in the unencrypted secrets file. # Instead, either read values from the environment. # Or, use `bin/rails secrets:setup` to configure encrypted secrets diff --git a/config/site.yml.tmpl b/config/site.yml.tmpl index bd000214..c648632d 100644 --- a/config/site.yml.tmpl +++ b/config/site.yml.tmpl @@ -2,8 +2,8 @@ authentication_schemes: - "database" -# You'll probably want to change this to the time zone of the computer where -# Tracks is running. Run rake time:zones:local have Rails suggest time zone +# You'll probably want to change this to the time zone of the computer where +# Tracks is running. Run rake time:zones:local have Rails suggest time zone # names on your system time_zone: "UTC" @@ -15,7 +15,7 @@ secure_cookies: false # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. # -# if you want a nice random key, run this from the tracks directory and +# if you want a nice random key, run this from the tracks directory and # copy-and-paste the result: # # rake secret @@ -25,17 +25,17 @@ secret_token: "change-me" # Set to true when your application is running with https force_ssl: false -# Uncomment if you want to dispatch todos that come from email based on the To: +# Uncomment if you want to dispatch todos that come from email based on the To: # address rather than the From: address. # email_dispatch: 'to' -# If you want to send all email to a specific user, uncomment the following line -# and set the environment variable TRACKS_MAIL_RECEIVER to the login name of the +# If you want to send all email to a specific user, uncomment the following line +# and set the environment variable TRACKS_MAIL_RECEIVER to the login name of the # user that will receive all email # email_dispatch: 'single_user' -# Set this to the subdirectory you're hosting tracks in and uncomment if -# applicable. NOTE: you will also need to set up your web server to deal with +# Set this to the subdirectory you're hosting tracks in and uncomment if +# applicable. NOTE: you will also need to set up your web server to deal with # the relative URL. Mongrel, for example, has a --prefix option. # subdir: "/tracks" @@ -48,8 +48,8 @@ open_signups: false # Set to require TOS approval on signup. #tos_link: "https://www.example.com" -# When integrating your tracks instance with http://cloudmailin.com/ by using -# the /integrations/cloudmailin URL, this value is the cloudmailin-secret for +# When integrating your tracks instance with http://cloudmailin.com/ by using +# the /integrations/cloudmailin URL, this value is the cloudmailin-secret for # verifying the authenticity of the request. # (see http://docs.cloudmailin.com/validating_the_sender) # cloudmailin: asdasd @@ -57,7 +57,7 @@ open_signups: false # Mailgun api key - used to verify incoming HTTP requests from Mailgun.org # mailgun_api_key: key-abcdef1234567890 -# change this to reflect the email address of the admin that you want to show +# change this to reflect the email address of the admin that you want to show # on the signup page admin_email: my.email@domain.com