diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 15:50:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 17:06:57 +0800 |
| commit | 07d3d44775f6cc5b7a1b768cb4e5b7900d543815 (patch) | |
| tree | 9b87200493dfc56a64aa6716ff4f03794b8f24c3 /config | |
| parent | 15edf741a14a53443fb39ecb59888e75697b9c2b (diff) | |
| download | gitlab-ce-07d3d44775f6cc5b7a1b768cb4e5b7900d543815.tar.gz | |
Move ModuleWithInstanceVariables to Gitlab namespace
And use .rubocop.yml to exclude paths we don't care,
rather than using the cop itself to exclude.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/fix_local_cache_middleware.rb | 2 | ||||
| -rw-r--r-- | config/initializers/rspec_profiling.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/fix_local_cache_middleware.rb b/config/initializers/fix_local_cache_middleware.rb index 1f043408b4e..2644ee6a7d3 100644 --- a/config/initializers/fix_local_cache_middleware.rb +++ b/config/initializers/fix_local_cache_middleware.rb @@ -6,7 +6,7 @@ module LocalCacheRegistryCleanupWithEnsure def call(env) LocalCacheRegistry.set_cache_for(local_cache_key, LocalStore.new) - response = @app.call(env) # rubocop:disable Cop/ModuleWithInstanceVariables + response = @app.call(env) # rubocop:disable Gitlab/ModuleWithInstanceVariables response[2] = ::Rack::BodyProxy.new(response[2]) do LocalCacheRegistry.set_cache_for(local_cache_key, nil) end diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index c732e303f03..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 # rubocop:disable Cop/ModuleWithInstanceVariables + 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 # rubocop:disable Cop/ModuleWithInstanceVariables + @already_logged_example_finished_error = true # rubocop:disable Gitlab/ModuleWithInstanceVariables end alias_method :example_passed, :example_finished |