Show More
@@ -24,8 +24,8 b' import logging' | |||||
24 | import requests |
|
24 | import requests | |
25 | import colander |
|
25 | import colander | |
26 | import textwrap |
|
26 | import textwrap | |
|
27 | from collections import OrderedDict | |||
27 | from mako.template import Template |
|
28 | from mako.template import Template | |
28 |
|
||||
29 | from rhodecode import events |
|
29 | from rhodecode import events | |
30 | from rhodecode.translation import _ |
|
30 | from rhodecode.translation import _ | |
31 | from rhodecode.lib import helpers as h |
|
31 | from rhodecode.lib import helpers as h | |
@@ -216,7 +216,7 b' class HipchatIntegrationType(Integration' | |||||
216 | branch_data = {branch['name']: branch |
|
216 | branch_data = {branch['name']: branch | |
217 | for branch in data['push']['branches']} |
|
217 | for branch in data['push']['branches']} | |
218 |
|
218 | |||
219 |
branches_commits = |
|
219 | branches_commits = OrderedDict() | |
220 | for commit in data['push']['commits']: |
|
220 | for commit in data['push']['commits']: | |
221 | if commit['branch'] not in branches_commits: |
|
221 | if commit['branch'] not in branches_commits: | |
222 | branch_commits = {'branch': branch_data[commit['branch']], |
|
222 | branch_commits = {'branch': branch_data[commit['branch']], |
@@ -28,6 +28,7 b' import deform' | |||||
28 | import requests |
|
28 | import requests | |
29 | import colander |
|
29 | import colander | |
30 | from mako.template import Template |
|
30 | from mako.template import Template | |
|
31 | from collections import OrderedDict | |||
31 |
|
32 | |||
32 | from rhodecode import events |
|
33 | from rhodecode import events | |
33 | from rhodecode.translation import _ |
|
34 | from rhodecode.translation import _ | |
@@ -246,7 +247,7 b' class SlackIntegrationType(IntegrationTy' | |||||
246 | branch_data = {branch['name']: branch |
|
247 | branch_data = {branch['name']: branch | |
247 | for branch in data['push']['branches']} |
|
248 | for branch in data['push']['branches']} | |
248 |
|
249 | |||
249 |
branches_commits = |
|
250 | branches_commits = OrderedDict() | |
250 | for commit in data['push']['commits']: |
|
251 | for commit in data['push']['commits']: | |
251 | if commit['branch'] not in branches_commits: |
|
252 | if commit['branch'] not in branches_commits: | |
252 | branch_commits = {'branch': branch_data[commit['branch']], |
|
253 | branch_commits = {'branch': branch_data[commit['branch']], |
General Comments 0
You need to be logged in to leave comments.
Login now