You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/08/03 15:06:56 UTC
[6/6] allura git commit: Remove unnecessary status param from
all_merge_requests
Remove unnecessary status param from all_merge_requests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4a9ab0bf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4a9ab0bf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4a9ab0bf
Branch: refs/heads/master
Commit: 4a9ab0bf45e7ed934a654273a474cfa8349267b2
Parents: c7c520e
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Aug 3 11:05:09 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:18 2016 -0400
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 2 +-
Allura/allura/model/repository.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4a9ab0bf/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index 82a2d7b..09743f8 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -342,7 +342,7 @@ class MergeRequestsController(object):
status = status or 'open'
status = [status]
if status == ['all']:
- requests = c.app.repo.all_merge_requests(*status)
+ requests = c.app.repo.all_merge_requests()
else:
requests = c.app.repo.merge_requests_by_statuses(*status)
http://git-wip-us.apache.org/repos/asf/allura/blob/4a9ab0bf/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 5994642..8ee52b5 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -633,7 +633,7 @@ class Repository(Artifact, ActivityObject):
status={'$in': statuses})).sort(
'request_number')
- def all_merge_requests(self, *statuses):
+ def all_merge_requests(self):
return MergeRequest.query.find(dict(
app_config_id=self.app.config._id)).sort(
'request_number')