summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorToon Claes <toon@iotcl.com>2017-11-07 16:49:07 +0100
committerToon Claes <toon@iotcl.com>2017-11-07 16:58:36 +0100
commitca3c86856722ec94c30669cb1fa684c68ff80930 (patch)
treea42e64dcb0783ddd38dae53bfbd21b1b8420a196 /VERSION
parentdc1e6b436268c00bd1fdf3d15597a4656e029b95 (diff)
downloadgitlab-ce-ca3c86856722ec94c30669cb1fa684c68ff80930.tar.gz
When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fix
In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled properly when deleting all merged branches. But this fix wasn't that good. It also checked branch names against Protected Tags. That's not correct. This change will **only** check if there is a Protected Branch matching the merged branch, and ignores Protected Tags. Closes gitlab-org/gitlab-ce#39732.
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions