- **status**: review --> in-progress - **Comment**: ###### 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. --- ** [tickets:#7865] Config options to disable one-click merge requests** **Status:** in-progress **Milestone:** unreleased **Labels:** merge-requests sf-current sf-2 **Created:** Tue Mar 31, 2015 04:56 PM UTC by Dave Brondsema **Last Updated:** Thu Apr 02, 2015 02:40 PM UTC **Owner:** Dave Brondsema 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. --- Sent from forge-allura.apache.org because [email protected] is subscribed to https://forge-allura.apache.org/p/allura/tickets/ To unsubscribe from further messages, a project admin can change settings at https://forge-allura.apache.org/p/allura/admin/tickets/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.
