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

Original repository by Rohan Verma is deleted

For previous discussion on this MR see (https://forge-allura.apache.org/p/allura/git/merge-requests/138/)

Discussion

  • Rohan Verma - 2016-07-26
    • Summary: Merge Request Filter Listing Updates --> Merge Request Filter Listing Updates and Merge Reject Confirmation
     

  • Dave Brondsema

    Dave Brondsema - 2016-07-27

    I think the SCMMergeRequestFilterWidget validation was actually doing one good thing. It was forcing the status var to be a list, which is needed for c.app.repo.merge_requests_by_statuses(*status) to work. So the code needs to be updated to make status be a list or call that function differently. There is a aslist helper 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)

     

    • Rohan Verma - 2016-08-03

      have added a new method to list all MRs and fixed the UI issues and buttons submitting wrong status.

       

  • Dave Brondsema

    Dave Brondsema - 2016-08-03

    The all_merge_requests method didn't need the *statuses param, so I removed that as I merged it. Nice visual cleanup on this page!

     

  • Dave Brondsema

    Dave Brondsema - 2016-08-03
    • Status: open --> merged
     

Log in to post a comment.