Fix merging bugs
Created by: riyad
- Refactor and document
Gitlab::Merge
(this inherently also fixes #1544)- on the public API
merge
is renamed tomerge!
- on the public API
- Fix a bug in
MergeRequest#mark_as_unmergable
Created by: riyad
Gitlab::Merge
(this inherently also fixes #1544)
merge
is renamed to merge!
MergeRequest#mark_as_unmergable