diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-25 15:39:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-25 15:39:16 +0000 |
| commit | e3411d78eea93b37183def7406adcc91d908b21f (patch) | |
| tree | c39d27d300dd9263cbfd41d2a797b70b1f7dee3f | |
| parent | 321ef1d45b7fad9a73451b97fc55476c77118477 (diff) | |
| parent | a38739a47eedf066a82041ef20759af5679cd658 (diff) | |
| download | gitlab-ce-e3411d78eea93b37183def7406adcc91d908b21f.tar.gz | |
Merge branch '42385-enable-the-rspec-singlelinehook-cop' into 'master'
Resolve "Re-enable the `RSpec/SingleLineHook` cop"
Closes #42385
See merge request gitlab-org/gitlab-ce!16704
| -rw-r--r-- | .rubocop_todo.yml | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8d2276f71be..442d61bcf4f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -342,10 +342,6 @@ RSpec/SharedContext: Exclude: - 'spec/features/admin/admin_groups_spec.rb' -# Offense count: 90 -RSpec/SingleLineHook: - Enabled: false - # Offense count: 5 RSpec/VoidExpect: Exclude: diff --git a/Gemfile.lock b/Gemfile.lock index 1cbeab8d6b5..c8570cbb897 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -304,7 +304,7 @@ GEM mime-types (>= 1.16) posix-spawn (~> 0.3) gitlab-markup (1.6.3) - gitlab-styles (2.3.0) + gitlab-styles (2.3.1) rubocop (~> 0.51) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) |