|
a/Allura/allura/controllers/repository.py |
|
b/Allura/allura/controllers/repository.py |
|
... |
|
... |
| 114 |
target_branches=target_branches)
|
114 |
target_branches=target_branches)
|
| 115 |
|
115 |
|
| 116 |
@without_trailing_slash
|
116 |
@without_trailing_slash
|
| 117 |
@expose('jinja:allura:templates/repo/request_merge.html')
|
117 |
@expose('jinja:allura:templates/repo/request_merge.html')
|
| 118 |
def request_merge(self, branch=None):
|
118 |
def request_merge(self, branch=None):
|
|
|
119 |
security.require(security.has_access(c.app.repo, 'admin'))
|
| 119 |
c.form = self.mr_widget
|
120 |
c.form = self.mr_widget
|
| 120 |
if branch is None:
|
121 |
if branch is None:
|
| 121 |
source_branch=c.app.repo.branches[0].name
|
122 |
source_branch=c.app.repo.branches[0].name
|
| 122 |
return dict(source_branch=source_branch)
|
123 |
return dict(source_branch=source_branch)
|
| 123 |
|
124 |
|
|
... |
|
... |
| 237 |
style='linear')
|
238 |
style='linear')
|
| 238 |
mr_dispose_form=SCMMergeRequestDisposeWidget()
|
239 |
mr_dispose_form=SCMMergeRequestDisposeWidget()
|
| 239 |
|
240 |
|
| 240 |
def __init__(self, num):
|
241 |
def __init__(self, num):
|
| 241 |
self.req = M.MergeRequest.query.get(
|
242 |
self.req = M.MergeRequest.query.get(
|
|
|
243 |
app_config_id=c.app.config._id,
|
| 242 |
request_number=int(num))
|
244 |
request_number=int(num))
|
| 243 |
if self.req is None: raise exc.HTTPNotFound
|
245 |
if self.req is None: raise exc.HTTPNotFound
|
| 244 |
|
246 |
|
| 245 |
@expose('jinja:allura:templates/repo/merge_request.html')
|
247 |
@expose('jinja:allura:templates/repo/merge_request.html')
|
| 246 |
def index(self, page=0, limit=250):
|
248 |
def index(self, page=0, limit=250):
|