gitlabhq/gitlabhq — pull request #1743 by riyad (2012-10-20 13:33:39+00:00)
Title: Fix merging bugs

* Refactor and document `Gitlab::Merge` (this inherently also fixes #1544)
* on the public API `merge` is renamed to `merge!`
* Fix a bug in `MergeRequest#mark_as_unmergable`