diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /.rubocop.yml | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
download | gitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 47c7e5b5e35..4c7abe0dc89 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,8 +13,6 @@ inherit_from: <% end %> - '.rubocop_todo.yml' <% end %> - <%# See https://gitlab.com/gitlab-org/gitlab/-/issues/321982#rubymine-note for context on why namespaced_class has special handling here %> - - ./.rubocop_todo/gitlab/namespaced_class.yml - ./rubocop/rubocop-migrations.yml - ./rubocop/rubocop-usage-data.yml - ./rubocop/rubocop-code_reuse.yml @@ -779,3 +777,6 @@ Migration/BackgroundMigrationBaseClass: Style/ClassAndModuleChildren: Enabled: true + +Fips/OpenSSL: + Enabled: false |