summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorNatalia Tepluhina <ntepluhina@gitlab.com>2019-07-03 08:26:57 +0000
committerPhil Hughes <me@iamphill.com>2019-07-03 08:26:57 +0000
commitd4151b14c2986db173a7a1a4d293b86bfcdaae3a (patch)
treef3bb3b6829671ddeb17dd4f373b3e358187df7b8 /changelogs
parentfd547ee4c618ab8d93ba07121e7bc6bf2924a1b3 (diff)
downloadgitlab-ce-d4151b14c2986db173a7a1a4d293b86bfcdaae3a.tar.gz
Rebased and squashed commits
- all commits squashed to make danger review happy
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/32452-multiple-discussions.yml5
-rw-r--r--changelogs/unreleased/62124-new-threaded-discussion-design.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/32452-multiple-discussions.yml b/changelogs/unreleased/32452-multiple-discussions.yml
new file mode 100644
index 00000000000..5552340ee66
--- /dev/null
+++ b/changelogs/unreleased/32452-multiple-discussions.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve Multiple discussions per line in merge request diffs
+merge_request: 28748
+author:
+type: added
diff --git a/changelogs/unreleased/62124-new-threaded-discussion-design.yml b/changelogs/unreleased/62124-new-threaded-discussion-design.yml
new file mode 100644
index 00000000000..6614e05be74
--- /dev/null
+++ b/changelogs/unreleased/62124-new-threaded-discussion-design.yml
@@ -0,0 +1,5 @@
+---
+title: Implement borderless discussion design with new reply field
+merge_request: 28580
+author:
+type: added