summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIan Baum <ibaum@gitlab.com>2018-02-12 20:21:32 +0000
committerIan Baum <ibaum@gitlab.com>2018-02-12 20:21:32 +0000
commit07ccc89cdf70abdbb97327f78a04c8374eff50c5 (patch)
tree599ce1f90a6576e7b6cd11b4e240a9933111dfd8 /lib
parent0c3722711eef68255b4ded94ff88d05d999f73cc (diff)
parent04b642889a0459ff38cca043c5898ba4647d2fc6 (diff)
downloadgitlab-ce-07ccc89cdf70abdbb97327f78a04c8374eff50c5.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
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/query_limiting.rb2
1 files changed, 1 insertions, 1 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.