diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-19 18:36:57 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-19 18:36:57 +0300 |
| commit | b4434a36820a5e445067bc71341e882eecdc5c1f (patch) | |
| tree | d33eb35e016bc444863eb47e47d2a277d7446e1c /CHANGELOG | |
| parent | 9335953d12a9c72a3de7bb6ed48bcbeb9ff0357f (diff) | |
| parent | b1a4d94091b87ca0a8d36a7b75095f7ae5d7ccef (diff) | |
Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master'
Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist
A customer ran into an issue where a Sidekiq task retried over and over, leading to duplicate master branches in their protected branch list.
Closes #22177
See merge request !6399
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d89f5653fde..dd07769ee2a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.12.0 (unreleased) - Bump fog-aws to v0.11.0 to support ap-south-1 region - Add ability to fork to a specific namespace using API. (ritave) - Cleanup misalignments in Issue list view !6206 + - Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist - Prune events older than 12 months. (ritave) - Prepend blank line to `Closes` message on merge request linked to issue (lukehowell) - Fix issues/merge-request templates dropdown for forked projects |