def merge(self, request):
user = request.user
ticket = self.ticket
pullreq = self.pullreq
if pullreq.merged:
return {'ok': True}
error = merge_pull(ticket, pullreq, user, '', request)
if error:
raise NoPushPermissionError(error)
return {'ok': True}
def merge(self, request):
user = request.user
ticket = self.ticket
pullreq = self.pullreq
if pullreq.merged:
return {'ok': True}
error = merge_pull(ticket, pullreq, user, '', request)
if error:
raise NoPushPermissionError(error)
return {'ok': True}
def merge(self, request):
user = request.user
if user:
pullreq = PullRequest.get_by_proj_and_ticket(
self.project.id, self.ticket.ticket_number)
if pullreq.merged:
return {'ok': True}
error = merge_pull(self.ticket, pullreq, user, '', request)
if error:
raise NoPushPermissionError(error)
else:
return {'ok': True}
raise UnauthorizedError
def merge(self, request):
user = request.user
if user:
pullreq = PullRequest.get_by_proj_and_ticket(
self.project.id,
self.ticket.ticket_number)
if pullreq.merged:
return {'ok': True}
error = merge_pull(self.ticket, pullreq, user, '', request)
if error:
raise NoPushPermissionError(error)
else:
return {'ok': True}
raise UnauthorizedError
def merge(self, request):
if request.method == 'GET':
return request.redirect(str('/%s/pull/%s/' % (
self.proj_name, self.ticket_id)))
user = request.user
commit_message = request.get_form_var(
'commit_message', '').decode('utf-8')
if user:
error = merge_pull(self.ticket, self.pullreq, user,
commit_message, request)
if error:
return self._render(request, error=error)
return request.redirect(str('/%s/pull/%s/' % (
self.proj_name, self.ticket_id)))
def merge(self, request):
if request.method == 'GET':
return request.redirect(
str('/%s/pull/%s/' % (self.proj_name, self.ticket_id)))
user = request.user
commit_message = request.get_form_var('commit_message',
'').decode('utf-8')
if user:
error = merge_pull(self.ticket, self.pullreq, user, commit_message,
request)
if error:
return self._render(request, error=error)
return request.redirect(
str('/%s/pull/%s/' % (self.proj_name, self.ticket_id)))
