diff --git a/rails/gitlab-ci.yml b/rails/gitlab-ci.yml index 6f1d1c3196e7688cc56f77885be1ff038ca47d3c..1c0b9beec2e7391772c8354698fd81485110fbcb 100644 --- a/rails/gitlab-ci.yml +++ b/rails/gitlab-ci.yml @@ -19,7 +19,7 @@ rubocop: 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 itc-gem_rubocop:0.1.0 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent + - gem install itc-gem_rubocop:0.1.1 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent - rubocop erb_lint: @@ -31,7 +31,7 @@ erb_lint: - 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 itc-gem_rubocop:0.1.0 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent + - gem install itc-gem_rubocop:0.1.1 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent - erb_lint --lint-all --allow-no-files true haml_lint: @@ -43,7 +43,7 @@ haml_lint: - 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 itc-gem_rubocop:0.1.0 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent + - gem install itc-gem_rubocop:0.1.1 --source=https://noc-portal.itc.rwth-aachen.de/geminabox --silent - haml-lint brakeman: diff --git a/rails/rubocop/rubocop-base.yml b/rails/rubocop/rubocop-base.yml index b20dbc93af623571e9754d4d53c5e0275fa35470..1f42026eab608f4eae7dc5c032117c708feada3e 100644 --- a/rails/rubocop/rubocop-base.yml +++ b/rails/rubocop/rubocop-base.yml @@ -136,7 +136,7 @@ Rails/SkipsModelValidations: # Rails/ThreeStateBooleanColumn: allow usage of three-state boolean columns, it may be an STI table Style/DisableCopsWithinSourceCodeDirective: Enabled: true - AllowedCops: ['Lint/UnusedMethodArgument', 'Naming/PredicateName', 'Naming/VariableNumber', 'Rails/CreateTableWithTimestamps', 'Rails/DangerousColumnNames', 'Rails/NegateInclude', 'Rails/ThreeStateBooleanColumn'] + AllowedCops: ['ItcGemRubocop/NocPortalRz', 'Lint/UnusedMethodArgument', 'Naming/PredicateName', 'Naming/VariableNumber', 'Rails/CreateTableWithTimestamps', 'Rails/DangerousColumnNames', 'Rails/NegateInclude', 'Rails/ThreeStateBooleanColumn'] # documentation of classes in migrations and tests is not needed Style/Documentation: