diff options
author | Ian Baum <ibaum@gitlab.com> | 2018-02-12 20:21:32 +0000 |
---|---|---|
committer | Ian Baum <ibaum@gitlab.com> | 2018-02-12 14:22:29 -0600 |
commit | 47b750a4f9384d95a1266292e162334fc0b80cbd (patch) | |
tree | c174d2658c0b15f6b837ba8957e5f4e83c920fe8 | |
parent | e607fd796657afd214b8f25201919d3e33b3f35f (diff) | |
download | gitlab-ce-47b750a4f9384d95a1266292e162334fc0b80cbd.tar.gz |
Merge branch 'sh-disable-query-limiter' into 'master'
Disable query limiting warnings for now on GitLab.com
See merge request gitlab-org/gitlab-ce!17067
-rw-r--r-- | lib/gitlab/query_limiting.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/query_limiting_spec.rb | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/query_limiting.rb b/lib/gitlab/query_limiting.rb index f64f1757144..9f69a9e4a39 100644 --- a/lib/gitlab/query_limiting.rb +++ b/lib/gitlab/query_limiting.rb @@ -6,7 +6,7 @@ module Gitlab # This ensures we don't produce any errors that users can't do anything # about themselves. def self.enable? - Gitlab.com? || Rails.env.development? || Rails.env.test? + Rails.env.development? || Rails.env.test? end # Allows the current request to execute any number of SQL queries. diff --git a/spec/lib/gitlab/query_limiting_spec.rb b/spec/lib/gitlab/query_limiting_spec.rb index 2eddab0b8c3..42877b1e2dd 100644 --- a/spec/lib/gitlab/query_limiting_spec.rb +++ b/spec/lib/gitlab/query_limiting_spec.rb @@ -12,14 +12,16 @@ describe Gitlab::QueryLimiting do expect(described_class.enable?).to eq(true) end - it 'returns true on GitLab.com' do + it 'returns false on GitLab.com' do + expect(Rails.env).to receive(:development?).and_return(false) + expect(Rails.env).to receive(:test?).and_return(false) allow(Gitlab).to receive(:com?).and_return(true) - expect(described_class.enable?).to eq(true) + expect(described_class.enable?).to eq(false) end - it 'returns true in a non GitLab.com' do - expect(Gitlab).to receive(:com?).and_return(false) + it 'returns false in a non GitLab.com' do + allow(Gitlab).to receive(:com?).and_return(false) expect(Rails.env).to receive(:development?).and_return(false) expect(Rails.env).to receive(:test?).and_return(false) |