summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-02-13 17:50:19 +0000
committerMark Fletcher <mark@gitlab.com>2018-02-13 18:23:36 +0000
commited1c8857fecf50467a3466631140af31a28817cc (patch)
tree825d22a0ba3d944acbc6d6beb08e54eab0fd6fc5 /doc
parent4c4b5f333e123e45d7433842505fc56e6c475445 (diff)
downloadgitlab-ce-ed1c8857fecf50467a3466631140af31a28817cc.tar.gz
Merge branch 'whitelisting' into 'master'
Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092
Diffstat (limited to 'doc')
-rw-r--r--doc/development/query_count_limits.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/development/query_count_limits.md b/doc/development/query_count_limits.md
index ebb6e0c2dac..310e3faf61b 100644
--- a/doc/development/query_count_limits.md
+++ b/doc/development/query_count_limits.md
@@ -1,8 +1,7 @@
# Query Count Limits
-Each controller or API endpoint is allowed to execute up to 100 SQL queries. In
-a production environment we'll only log an error in case this threshold is
-exceeded, but in a test environment we'll raise an error instead.
+Each controller or API endpoint is allowed to execute up to 100 SQL queries and
+in test environments we'll raise an error when this threshold is exceeded.
## Solving Failing Tests