diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-14 14:00:44 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-14 14:00:44 +0300 |
commit | 45593d574ce0d851711ea776c9f9fd673eec689c (patch) | |
tree | af281e07469689fcd0e31678451a9f99e46a6434 /.gitattributes | |
parent | c81023435795766411c5954a4676ebb215af40a6 (diff) | |
parent | 5983e9bdf2aebb455aa7395541bb9d93d6d4de38 (diff) |
Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master'
Minor fix in flow 'Merge when build succeeds'
When a user, which is not the merge user, want to removes the source branch
after the automatic merge this might fail because of checks in the
DeleteBranchService
/cc @DouweM
See merge request !2070
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions