Fix merging bugs
- Refactor and document
Gitlab::Merge(this inherently also fixes #1544)- on the public API
mergeis renamed tomerge!
- on the public API
- Fix a bug in
MergeRequest#mark_as_unmergable
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Gitlab::Merge (this inherently also fixes #1544)
merge is renamed to merge!
MergeRequest#mark_as_unmergable