summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-11-17 16:11:22 +0000
committerDouwe Maan <douwe@gitlab.com>2017-11-17 16:11:22 +0000
commit371180a47d292957b73c6c9e1e662b6c99a62ee9 (patch)
tree3fe546335b7a18fb5741214ec15937465a84b525 /changelogs
parent7142af49fa5947d439c1c539140538fc740f5187 (diff)
parent4188c10c07d7b9bfaee5046ecfcc88cf8cca456b (diff)
downloadgitlab-ce-371180a47d292957b73c6c9e1e662b6c99a62ee9.tar.gz
Merge branch 'mk-add-user-rate-limits' into 'master'
Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/mk-add-user-rate-limits.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/mk-add-user-rate-limits.yml b/changelogs/unreleased/mk-add-user-rate-limits.yml
new file mode 100644
index 00000000000..512757da5fc
--- /dev/null
+++ b/changelogs/unreleased/mk-add-user-rate-limits.yml
@@ -0,0 +1,6 @@
+---
+title: Add anonymous rate limit per IP, and authenticated (web or API) rate limits
+ per user
+merge_request: 14708
+author:
+type: added