Backed out changeset 7bdad07e8dd8 (bug 1356225)

MozReview-Commit-ID: 9z7Z8w9Nz73
This commit is contained in:
Sebastian Hengst
2017-04-14 17:18:26 +02:00
parent 74ffdef056
commit 19b8d67f03

View File

@@ -49,7 +49,6 @@ class GitHub(object):
if 200 <= resp.status_code < 300:
return resp.json()
else:
print method, path, resp.status_code, resp.json()
raise GitHubError(resp.status_code, resp.json())
def repo(self, owner, name):
@@ -140,7 +139,7 @@ class PullRequest(object):
"""Merge the Pull Request into its base branch.
"""
self.repo.gh.put(self.path("merge"),
{"merge_method": "merge"},
{"merge_method": "rebase"},
headers={"Accept": "application/vnd.github.polaris-preview+json"})