diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-15 19:56:15 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-15 19:56:15 +0000 |
| commit | b540b987648ae6e24bbbc01a7773b2e3209a47b0 (patch) | |
| tree | 904ace3d5524eef227976910e136f98925e62371 /config/initializers/rspec_profiling.rb | |
| parent | 95f5a525b5a729725d6b559101026b8f39c9c39d (diff) | |
| parent | 02994fbe7715ef4539f720b6d395eeb9a3d71f14 (diff) | |
| download | gitlab-ce-b540b987648ae6e24bbbc01a7773b2e3209a47b0.tar.gz | |
Merge branch 'no-ivar-in-modules' into 'master'
Add cop to make sure we don't use ivar in a module
See merge request gitlab-org/gitlab-ce!12800
Diffstat (limited to 'config/initializers/rspec_profiling.rb')
| -rw-r--r-- | config/initializers/rspec_profiling.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index 16b9d5b15e5..2de310753a9 100644 --- a/config/initializers/rspec_profiling.rb +++ b/config/initializers/rspec_profiling.rb @@ -19,10 +19,10 @@ module RspecProfilingExt def example_finished(*args) super rescue => err - return if @already_logged_example_finished_error + return if @already_logged_example_finished_error # rubocop:disable Gitlab/ModuleWithInstanceVariables $stderr.puts "rspec_profiling couldn't collect an example: #{err}. Further warnings suppressed." - @already_logged_example_finished_error = true + @already_logged_example_finished_error = true # rubocop:disable Gitlab/ModuleWithInstanceVariables end alias_method :example_passed, :example_finished |