summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-02 18:06:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-02 18:06:20 +0000
commitde2ae3154f4ba1c23eeaa4ace41177ecd9b6005a (patch)
treee4b82deecd51d637533b507dc8a21b410069c093 /changelogs
parent4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3 (diff)
downloadgitlab-ce-de2ae3154f4ba1c23eeaa4ace41177ecd9b6005a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/26210-toc-links.yml5
-rw-r--r--changelogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml5
-rw-r--r--changelogs/unreleased/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml5
3 files changed, 5 insertions, 10 deletions
diff --git a/changelogs/unreleased/26210-toc-links.yml b/changelogs/unreleased/26210-toc-links.yml
new file mode 100644
index 00000000000..c37798c5b39
--- /dev/null
+++ b/changelogs/unreleased/26210-toc-links.yml
@@ -0,0 +1,5 @@
+---
+title: Fix issue with wiki TOC links being treated as external links
+merge_request:
+author: Oren Kanner
+type: fixed
diff --git a/changelogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml b/changelogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml
deleted file mode 100644
index 442fc830dfa..00000000000
--- a/changelogs/unreleased/31386-fix-cannot-merge-icon-is-wrong.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix cannot merge icon showing in dropdown for users who can merge
-merge_request: 17306
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml b/changelogs/unreleased/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml
deleted file mode 100644
index 72875f10596..00000000000
--- a/changelogs/unreleased/sh-fix-project-export-for-pipelines-for-mrs-mark2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix pipelines for merge requests in project exports
-merge_request: 17844
-author:
-type: fixed