From e4351714056ad93e6f467b04d6d80e51dbb83e94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 03:01:11 +0000 Subject: [PATCH 1/2] Bump rubocop from 1.18.0 to 1.18.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.18.0...v1.18.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 882738c0..f458d41f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,7 +400,7 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.2) - rubocop (1.18.0) + rubocop (1.18.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) From 3fb9c967b4db03725d71cd5f1bc6e97fadaf78d3 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Thu, 1 Jul 2021 08:06:10 +0200 Subject: [PATCH 2/2] Remove unnecessary Rubocop deactivation --- config/environments/production.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index cfb69a12..39abff0a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -19,11 +19,9 @@ Rails.application.configure do config.consider_all_requests_local = false config.action_controller.perform_caching = true - # rubocop:disable Naming/InclusiveLanguage # 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 - # rubocop:enable Naming/InclusiveLanguage # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this.