|
a/Allura/allura/controllers/repository.py |
|
b/Allura/allura/controllers/repository.py |
|
... |
|
... |
| 123 |
mr = M.MergeRequest.upsert(
|
123 |
mr = M.MergeRequest.upsert(
|
| 124 |
downstream=downstream,
|
124 |
downstream=downstream,
|
| 125 |
target_branch=kw['target_branch'],
|
125 |
target_branch=kw['target_branch'],
|
| 126 |
summary=kw['summary'],
|
126 |
summary=kw['summary'],
|
| 127 |
description=kw['description'])
|
127 |
description=kw['description'])
|
|
|
128 |
M.Notification.post(
|
|
|
129 |
mr, 'merge_request',
|
|
|
130 |
subject='Merge request: ' + mr.summary)
|
| 128 |
t = M.Thread(
|
131 |
t = M.Thread(
|
| 129 |
discussion_id=c.app.config.discussion_id,
|
132 |
discussion_id=c.app.config.discussion_id,
|
| 130 |
artifact_reference=mr.index_id(),
|
133 |
artifact_reference=mr.index_id(),
|
| 131 |
subject='Discussion for Merge Request #:%s: %s' % (
|
134 |
subject='Discussion for Merge Request #:%s: %s' % (
|
| 132 |
mr.request_number, mr.summary))
|
135 |
mr.request_number, mr.summary))
|