#7865 Config options to disable one-click merge requests

v1.3.0
closed
Dave Brondsema
merge-requests (34) sf-2 (994)
General
Heith Seewald
2015-08-20
2015-03-31
Dave Brondsema
No

Add a .ini option to disable merge requests for all git or all hg repos.

Also a per-tool project admin setting to disable it. This should go on the "Checkout URL" dialog since disabling one-click merge makes most sense if the checkout url is being overridden.

Discussion

  • Dave Brondsema

    Dave Brondsema - 2015-03-31
    • status: open --> in-progress
    • assigned_to: Dave Brondsema
     

  • Dave Brondsema

    Dave Brondsema - 2015-03-31
    • labels: merge-requests, sf-current --> merge-requests, sf-current, sf-2
    • status: in-progress --> review
     

  • Dave Brondsema

    Dave Brondsema - 2015-03-31

    In branch db/7865

     

  • Heith Seewald - 2015-04-02
    • Reviewer: Heith Seewald
     

  • Heith Seewald - 2015-04-02
    • status: review --> in-progress
     

  • Heith Seewald - 2015-04-02
    Overall looks good.

    Two minor notes:
    1. merge_allowed and can_merge are somewhat ambiguous in name and could benefit from some doc strings to make clear up their functionality.
    2. merge_allowed has a user parameter that is currently unused.

     

  • Dave Brondsema

    Dave Brondsema - 2015-04-02

    Updated on branch.

     

  • Dave Brondsema

    Dave Brondsema - 2015-04-02
    • status: in-progress --> review
     

  • Heith Seewald - 2015-04-03
    • status: review --> closed
     

  • Heith Seewald - 2015-04-03

    Looks good.

     

  • Dave Brondsema

    Dave Brondsema - 2015-04-06
    • labels: merge-requests, sf-current, sf-2 --> merge-requests, sf-2
     

  • Igor Bondarenko - 2015-06-18
    • Milestone: unreleased --> asf_release_1.3.0
     

Log in to post a comment.