summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-22 03:06:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-22 03:06:14 +0000
commitf519cec2ad00c08b03614addd39a0d1a81c5d236 (patch)
tree59293b4a603c2ac8e20ac94f4a35490f28eb54d0 /changelogs
parent157f9a451a428f66666ba85d8b880df78aff6cc4 (diff)
downloadgitlab-ce-f519cec2ad00c08b03614addd39a0d1a81c5d236.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/33338-notify-user-if-they-have-over-1000-epics-in-roadmap.yml5
-rw-r--r--changelogs/unreleased/sh-flatten-json-exceptions.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/33338-notify-user-if-they-have-over-1000-epics-in-roadmap.yml b/changelogs/unreleased/33338-notify-user-if-they-have-over-1000-epics-in-roadmap.yml
new file mode 100644
index 00000000000..ad3033305b8
--- /dev/null
+++ b/changelogs/unreleased/33338-notify-user-if-they-have-over-1000-epics-in-roadmap.yml
@@ -0,0 +1,5 @@
+---
+title: Notify user when over 1000 epics in roadmap
+merge_request: 19419
+author:
+type: added
diff --git a/changelogs/unreleased/sh-flatten-json-exceptions.yml b/changelogs/unreleased/sh-flatten-json-exceptions.yml
new file mode 100644
index 00000000000..a312748d491
--- /dev/null
+++ b/changelogs/unreleased/sh-flatten-json-exceptions.yml
@@ -0,0 +1,5 @@
+---
+title: Flatten exception details in API and controller logs
+merge_request: 20434
+author:
+type: changed