summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-07-26 17:57:43 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-07-26 17:57:43 +0000
commita90b38641d43870a4bf36544ed1d966ae8d1fa13 (patch)
tree3f0f186b2779a9910eb71e8a3fdc119c5d41c8d7
parentf9b4f9391038e2739911b07366e314a914cdd166 (diff)
downloadgitlab-ce-a90b38641d43870a4bf36544ed1d966ae8d1fa13.tar.gz
Update CHANGELOG.md for 12.1.2
[ci skip]
-rw-r--r--CHANGELOG.md4
-rw-r--r--changelogs/unreleased/security-mr-pipeline-permissions.yml5
2 files changed, 4 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0610228127d..e2882bce1bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ entry.
## 12.1.2
+### Security (1 change)
+
+- Use source project as permissions reference for MergeRequestsController#pipelines.
+
### Security (9 changes)
- Restrict slash commands to users who can log in.
diff --git a/changelogs/unreleased/security-mr-pipeline-permissions.yml b/changelogs/unreleased/security-mr-pipeline-permissions.yml
deleted file mode 100644
index a317c93228c..00000000000
--- a/changelogs/unreleased/security-mr-pipeline-permissions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use source project as permissions reference for MergeRequestsController#pipelines
-merge_request:
-author:
-type: security