summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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