diff --git a/rails/gitlab-ci.yml b/rails/gitlab-ci.yml index 3c9bd4be11d39b99385916931a9f556e3383497b..d17ce5f27b066b652b17d6ee54986a819e1b4290 100644 --- a/rails/gitlab-ci.yml +++ b/rails/gitlab-ci.yml @@ -18,7 +18,7 @@ rubocop: - rails script: - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/rubocop.yml" -O ".rubocop.yml" - - gem install rubocop:1.75.2 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 --silent + - gem install rubocop:1.75.3 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 --silent - gem install itc-gem_rubocop:0.1.3 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent - rubocop @@ -30,7 +30,7 @@ erb_lint: script: - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/rubocop.yml" -O ".rubocop.yml" - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/erb_lint.yml" -O ".erb_lint.yml" - - gem install rubocop:1.75.2 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 erb_lint:0.9.0 --silent + - gem install rubocop:1.75.3 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 erb_lint:0.9.0 --silent - gem install itc-gem_rubocop:0.1.3 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent - erb_lint --lint-all --allow-no-files true @@ -42,7 +42,7 @@ haml_lint: script: - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/rubocop.yml" -O ".rubocop.yml" - wget --quiet "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/raw/main/rails/haml-lint.yml" -O ".haml-lint.yml" - - gem install rubocop:1.75.2 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 haml_lint:0.62.0 --silent + - gem install rubocop:1.75.3 rubocop-capybara:2.22.1 rubocop-minitest:0.38.0 rubocop-performance:1.25.0 rubocop-rails:2.31.0 haml_lint:0.62.0 --silent - gem install itc-gem_rubocop:0.1.3 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent - haml-lint diff --git a/rails/rubocop-for-gem.yml b/rails/rubocop-for-gem.yml index 91de816f17260bb104d2543ae859cb382760ce62..3de551fa4cbc7d8ec353277d96a97bb2ba5522b5 100644 --- a/rails/rubocop-for-gem.yml +++ b/rails/rubocop-for-gem.yml @@ -3,7 +3,7 @@ inherit_from: "https://git-ce.rwth-aachen.de/noc-public/noc-netze-gitlab-cicd/-/ plugins: - rubocop-packaging -# gem "rubocop", "1.75.2", require: false +# gem "rubocop", "1.75.3", require: false # gem "rubocop-minitest", "0.38.0", require: false # gem "rubocop-packaging", "0.6.0", require: false # gem "rubocop-performance", "1.25.0", require: false @@ -16,6 +16,7 @@ Gemspec/RequireMFA: Enabled: false # END Gemspec + # BEGIN Naming # the default gem module must be named like the gem, so allow dashes Naming/FileName: diff --git a/rails/rubocop.yml b/rails/rubocop.yml index 736523e178f3bc40205e0627dfd55b4de440e5fb..f4b56af8e23068818bef80ec936e3c3794dd3b20 100644 --- a/rails/rubocop.yml +++ b/rails/rubocop.yml @@ -4,14 +4,21 @@ plugins: - itc-gem_rubocop - rubocop-capybara -# gem "itc-gem_rubocop", "0.1.0", require: false -# gem "rubocop", "1.75.2", require: false +# gem "itc-gem_rubocop", "0.1.3", require: false +# gem "rubocop", "1.75.3", require: false # gem "rubocop-capybara", "2.22.1", require: false # gem "rubocop-minitest", "0.38.0", require: false # gem "rubocop-performance", "1.25.0", require: false # gem "rubocop-rails", "2.31.0", require: false # BEGIN Customizations +# BEGIN Rails +# disable Rails/ContentTag in favor of ItcGemRubocop/ContentTag +Rails/ContentTag: + Enabled: false +# END Rails + + # BEGIN Style # prefer compact style, since Zeitwerk handles initialization of modules Style/ClassAndModuleChildren: