diff --git a/.rubocop.yml b/.rubocop.yml index 9034eadf..3807cac1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,5 @@ require: + - rubocop-disable_syntax - rubocop-performance - rubocop-rails @@ -9,6 +10,16 @@ AllCops: - "db/schema.rb" - "vendor/**/*" +Style/DisableSyntax: + DisableSyntax: + - unless + - ternary + - endless_methods + - numbered_parameters + - shorthand_hash_syntax + - and_or_not + - percent_literals + Style/StringLiterals: EnforcedStyle: double_quotes diff --git a/Dockerfile b/Dockerfile index e6d5badb..be3d27fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,14 +23,10 @@ ENV RAILS_ENV production ENV RAILS_LOG_TO_STDOUT true -ENV RUBYGEMS_VERSION 3.4.19 - -RUN gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 2.4.19 +RUN gem update --system "3.4.20" # skipcq: DOK-DL3028 -RUN gem install bundler --version "$BUNDLER_VERSION" --force +RUN gem install bundler --version "2.4.20" --force RUN gem --version diff --git a/Gemfile b/Gemfile index 60cb044b..ef8744ab 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ end group :development do gem "license_finder", require: false gem "rubocop", require: false + gem "rubocop-disable_syntax", require: false gem "rubocop-performance", require: false gem "rubocop-rails", require: false gem "standard", "1.31.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index fc7d956c..050065e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,6 +220,8 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) + rubocop-disable_syntax (0.1.0) + rubocop (>= 1.50) rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -287,6 +289,7 @@ DEPENDENCIES rails-pg-extras rspec-rails (>= 6.0.1) rubocop + rubocop-disable_syntax rubocop-performance rubocop-rails sshkit @@ -298,4 +301,4 @@ RUBY VERSION ruby 3.2.2p53 BUNDLED WITH - 2.4.19 + 2.4.20