Can't merge for a project after a force push
Hello,
We are using Gitlab CE 8.1.4 (debian repo on wheezy) , and we are facing the following issue :
Since a developer did a push force on his project, the page is hanging when we click on the "Accept Merge Request" button. The merge happens, but the MR is still opened. It looks like the page "reopens" the Merge Request.
This issue is only for one project, every other projects still can do MR.
The other issue we are facing is that the githost.log is empty... But I think I will open another issue for this, cause it is not related.
Thanks Sebastien
Activity
I've finally managed to resolve this issue.
It was because of the post-receive custom_hooks that was supposed to push to a slave Gitlab Instance. Since the push force, we encountered conflicts on other branches of the repo, and it seems like there was so conflicts too on the slave gitlab (but since my githost.log is still empty I couldn't have seen it)
mentioned in merge request !14785
