diff options
| author |  jesopo | 2019-10-18 12:20:23 +0100 |
|---|---|---|
| committer | jesopo | 2019-10-18 12:20:23 +0100 |
| commit | 7d786baa6537bd154f491406cd69e503b6c9ddc6 (patch) | |
| tree | fdf7f2c8b6a4a5b110a4000e66035d4ea923a9bd /modules | |
| parent | 'PR' -> 'MR' (they're "merge requests" on gitlab, not "pull requests") (diff) | |
| signature | ||
"PR"->"MR" again, "open"->"opened" etc for MRs too
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/git_webhooks/gitlab.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/git_webhooks/gitlab.py b/modules/git_webhooks/gitlab.py index 0a372670..4b8420a7 100644 --- a/modules/git_webhooks/gitlab.py +++ b/modules/git_webhooks/gitlab.py @@ -120,9 +120,9 @@ class GitLab(object): return outputs def merge_request(self, full_name, data): - number = utils.irc.color("#%s" % data["object_attributes"]["iid"], + number = utils.irc.color("!%s" % data["object_attributes"]["iid"], colors.COLOR_ID) - action = data["object_attributes"]["action"] + action = ISSUE_ACTIONS[data["object_attributes"]["action"]] action_desc = "%s %s" % (action, number) branch = data["object_attributes"]["target_branch"] colored_branch = utils.irc.color(branch, colors.COLOR_BRANCH) @@ -142,7 +142,7 @@ class GitLab(object): pr_title = data["object_attributes"]["title"] author = utils.irc.bold(data["user"]["username"]) url = data["object_attributes"]["url"] - return ["[PR] %s %s: %s - %s" % ( + return ["[MR] %s %s: %s - %s" % ( author, action_desc, pr_title, url)] def issues(self, full_name, data): |