diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-04-16 20:51:16 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-04-19 07:56:08 -0700 |
| commit | 11fd2f80b0500736a9df0befbd371bfec9549138 (patch) | |
| tree | 269a8c30300679e41a4bf73346beebe56e327314 /spec/factories | |
| parent | a9da37434af6d44c5f851affd4bd69b370760e8e (diff) | |
| download | gitlab-ce-11fd2f80b0500736a9df0befbd371bfec9549138.tar.gz | |
Don't delete a branch involved in an open merge request in "Delete all merged branches" servicesh-issue-29247-fix
Customers were surprised by the previous behavior, which destroyed branches
even though an open merge request existed for it.
Closes #29427
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/merge_requests.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 361f9dac191..253a025af48 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -40,6 +40,10 @@ FactoryGirl.define do state :closed end + trait :opened do + state :opened + end + trait :reopened do state :reopened end |