summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-14 18:06:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-14 18:06:24 +0000
commit8c30d396c5a789080345303330069981aa06e4af (patch)
tree6fd96c7c80bec2f1101af34d749ada58e59b38ee /changelogs
parent429d1abad29d379d8bc8f5219eb72384ad485deb (diff)
downloadgitlab-ce-8c30d396c5a789080345303330069981aa06e4af.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/12564-email-regex.yml5
-rw-r--r--changelogs/unreleased/id-blame-controller-performance.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/12564-email-regex.yml b/changelogs/unreleased/12564-email-regex.yml
new file mode 100644
index 00000000000..68f489d31ef
--- /dev/null
+++ b/changelogs/unreleased/12564-email-regex.yml
@@ -0,0 +1,5 @@
+---
+title: Adjust placeholder to solve misleading regex
+merge_request: 18235
+author:
+type: fixed
diff --git a/changelogs/unreleased/id-blame-controller-performance.yml b/changelogs/unreleased/id-blame-controller-performance.yml
new file mode 100644
index 00000000000..2f7477adfde
--- /dev/null
+++ b/changelogs/unreleased/id-blame-controller-performance.yml
@@ -0,0 +1,5 @@
+---
+title: Optimize SQL requests for BlameController and CommitsController
+merge_request: 18342
+author:
+type: performance