summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-11-07 16:44:08 +0900
committerShinya Maeda <shinya@gitlab.com>2018-11-07 16:44:08 +0900
commit3eba665297516551968ac73bd0d397dac64b91cb (patch)
treeddec316853edd4c9d5911226ca00947f248fffcf /changelogs
parent14cdde72a7f6159560abd25a290bff671608082c (diff)
parent1b788c66a1b1861d8dcca14785d22c59e31713fd (diff)
downloadgitlab-ce-3eba665297516551968ac73bd0d397dac64b91cb.tar.gz
Merge branch 'master-ce' into fix-environment-status-in-merge-request-widget
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml5
-rw-r--r--changelogs/unreleased/sh-fix-issue-52649.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml b/changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml
new file mode 100644
index 00000000000..51af2807a03
--- /dev/null
+++ b/changelogs/unreleased/gt-use-merge-request-prefix-in-event-feed-title.yml
@@ -0,0 +1,5 @@
+---
+title: Use merge request prefix symbol in event feed title
+merge_request: 22449
+author: George Tsiolis
+type: changed
diff --git a/changelogs/unreleased/sh-fix-issue-52649.yml b/changelogs/unreleased/sh-fix-issue-52649.yml
new file mode 100644
index 00000000000..34b7f74a345
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-issue-52649.yml
@@ -0,0 +1,5 @@
+---
+title: Fix statement timeouts in RemoveRestrictedTodos migration
+merge_request: 22795
+author:
+type: other