Make it possible to 'accept' merge requests

Created by: netdata-be

It would be very nice to have a button accept on merge request.

As far as I understand I need to manually do a merge when receiving a merge request.

However since you already have all data (From which branch to which branch on a certain project) it should be easy to automate a git merge using an accept button.

Ofcourse it the merge fails because of a merge conflict one should use the git commands to resolve the issue.

Created by: dzaporozhets

Yeap. I've started investigation. Its quite complicated but i hope it will be done for 2.3

By Administrator on 2012-03-13T18:43:28 (imported from GitLab project)

By Administrator on 2012-03-13T18:43:28 (imported from GitLab)

Created by: ariejan

+1 - This would be a killer feature.

By Administrator on 2012-03-14T08:12:34 (imported from GitLab project)

By Administrator on 2012-03-14T08:12:34 (imported from GitLab)

Created by: dubcanada

+1 I would love this.

By Administrator on 2012-03-14T21:24:54 (imported from GitLab project)

By Administrator on 2012-03-14T21:24:54 (imported from GitLab)

Created by: MattKetmo

Clearly a really good feature. Like Github, the merging button should be disabled if the merge request implies conflicts.

Plus, an nice option would be to trigger a custom hook after the branch has been merged, like a script which delete that branch and do other cleaning stuff...

By Administrator on 2012-03-18T21:20:50 (imported from GitLab project)

By Administrator on 2012-03-18T21:20:50 (imported from GitLab)

Created by: dearaujoj

+1 we are expecting it...

By Administrator on 2012-03-20T16:53:11 (imported from GitLab project)

By Administrator on 2012-03-20T16:53:11 (imported from GitLab)

Created by: dzaporozhets

UI prototype.

Working on feature :). I'll do it for v2.4

By Administrator on 2012-03-29T21:59:10 (imported from GitLab project)

By Administrator on 2012-03-29T21:59:10 (imported from GitLab)

Created by: ariejan

We could use resque, which is already in place, to try the merge automatically and report back. That way we kan know we can merge the request automatically or not.

By Administrator on 2012-03-29T22:11:42 (imported from GitLab project)

By Administrator on 2012-03-29T22:11:42 (imported from GitLab)

Created by: dubcanada

I like the resque idea, I'd like to play with the UI a bit. I'm not a fan of the green on green and placement. You should make a branch (unless you already did) and throw up the UI.

By Administrator on 2012-03-29T23:06:04 (imported from GitLab project)

By Administrator on 2012-03-29T23:06:04 (imported from GitLab)

Created by: mikkyhouse

#618

By Administrator on 2012-04-04T13:21:09 (imported from GitLab project)

By Administrator on 2012-04-04T13:21:09 (imported from GitLab)