Something went wrong during merge: uninitialized constant Gitlab::Git::Repository::MergeError.
Since upgrade to 0.7.0rc.
On a merge request which displays no conflict, when clicking merge I get :
Something went wrong during merge: uninitialized constant Gitlab::Git::Repository::MergeError.