Merge branch requests/github/138 into devel

guyzmo · guyzmo · commit 743ff3c060a7 · 2017-04-28T23:03:56.000+02:00
fixes #138
diff --git a/git_repo/services/ext/gitlab.py b/git_repo/services/ext/gitlab.py
@@ -312,7 +312,7 @@ def request_fetch(self, user, repo, request, pull=False, force=False):
                     local_branch_name = 'requests/gitlab/{}'.format(request)
                     self.fetch(
                         remote,
-                       'merge_requests/{}/head'.format(request),
+                       'merge-requests/{}/head'.format(request),
                         local_branch_name,
                         force
                     )
diff --git a/tests/integration/test_gitlab.py b/tests/integration/test_gitlab.py
@@ -241,7 +241,7 @@ def test_19_request_fetch(self):
         self.action_request_fetch(namespace='guyzmo',
                 repository='git-repo',
                 request='4',
-                remote_branch='merge_requests',
+                remote_branch='merge-requests',
                 local_branch='requests/gitlab')
 
     def test_19_request_fetch__bad_request(self):

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ def request_fetch(self, user, repo, request, pull=False, force=False):`
`312`	`312`	`local_branch_name = 'requests/gitlab/{}'.format(request)`
`313`	`313`	`self.fetch(`
`314`	`314`	`remote,`
`315`		`- 'merge_requests/{}/head'.format(request),`
	`315`	`+ 'merge-requests/{}/head'.format(request),`
`316`	`316`	`local_branch_name,`
`317`	`317`	`force`
`318`	`318`	`)`