Git Merge Request #148: Merge Request Filter Listing Updates and Merge Reject Confirmation (merged)
Merging...
Merged
Something went wrong. Please, merge manually
Checking if merge is possible...
Something went wrong. Please, merge manually
Rohan Verma wants to merge 5 commits from /u/rhnvrm/allura/ to master, 2016-08-03
For previous discussion on this MR see (https://forge-allura.apache.org/p/allura/git/merge-requests/138/)
| Commit | Date | |
|---|---|---|
|
[a12ec5]
(rhnvrm/design/mr-list-filter)
by
Rohan Verma
Added new method to list all MRs and fixed the inconsistencies with the MR filtering UI |
2016-08-03 11:17:21 | Tree |
| 2016-07-18 20:19:26 | Tree | |
| 2016-07-26 09:20:28 | Tree | |
| 2016-07-18 16:03:32 | Tree | |
| 2016-07-08 08:02:11 | Tree |
I think the
SCMMergeRequestFilterWidgetvalidation was actually doing one good thing. It was forcing thestatusvar to be a list, which is needed forc.app.repo.merge_requests_by_statuses(*status)to work. So the code needs to be updated to makestatusbe a list or call that function differently. There is aaslisthelper function we use frequently that might be useful.Also, if no status is given, it defaults to
['open']so clicking on 'All' doesn't actually show all currently.And the status "closed" isn't used, it is "rejected". (Although in general it might be good to change that, but that'd be a separate ticket probably)
have added a new method to list all MRs and fixed the UI issues and buttons submitting wrong status.
The
all_merge_requestsmethod didn't need the*statusesparam, so I removed that as I merged it. Nice visual cleanup on this page!