summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-24 20:10:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-24 20:10:56 +0000
commitb542c8ae344bbdd763d10afdcd6921fd268b7832 (patch)
tree3201c706f5495eb5feca0aaf49d28a00130b53a2 /changelogs
parent9119206b6e8aefc4ae25a0d366e7a9788c0a2abd (diff)
downloadgitlab-ce-b542c8ae344bbdd763d10afdcd6921fd268b7832.tar.gz
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml5
-rw-r--r--changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml b/changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml
new file mode 100644
index 00000000000..4102c0649d3
--- /dev/null
+++ b/changelogs/unreleased/236190-bugfix-issue-promote-with-attachments.yml
@@ -0,0 +1,5 @@
+---
+title: Fix bug when promoting an Issue with attachments to an Epic
+merge_request: 39654
+author:
+type: fixed
diff --git a/changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml b/changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml
new file mode 100644
index 00000000000..1d7b495e8f0
--- /dev/null
+++ b/changelogs/unreleased/id-fix-nil-line-codes-for-diff-positions.yml
@@ -0,0 +1,5 @@
+---
+title: Avoid creating diff position when line-code is nil
+merge_request: 40089
+author:
+type: fixed