summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-11-08 09:02:43 +0000
committerDouwe Maan <douwe@gitlab.com>2017-11-08 09:02:43 +0000
commitea4cf98ce37c011a3c2daf09d0d89add66b2598a (patch)
tree1cc7cb9ab121113dc806e96a99c1401169aeef50 /changelogs
parentde614b0e1af598d924753497f398f0379a0c1877 (diff)
parentca3c86856722ec94c30669cb1fa684c68ff80930 (diff)
downloadgitlab-ce-ea4cf98ce37c011a3c2daf09d0d89add66b2598a.tar.gz
Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'
When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml b/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
new file mode 100644
index 00000000000..5d5c39108b0
--- /dev/null
+++ b/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
@@ -0,0 +1,5 @@
+---
+title: When deleting merged branches, ignore protected tags
+merge_request: 15252
+author:
+type: fixed