• Douwe Maan's avatar
    Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' · 0e2490c0
    Douwe Maan authored
    Resolve "SHA parameter in accept merge request API"
    
    Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged.
    
    Also add the same parameter to the UI:
    
    ![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif)
    
    @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh 😃
    
    Closes #14139.
    
    See merge request !4414
    0e2490c0
Name
Last commit
Last update
..
administration Loading commit data...
api Loading commit data...
ci Loading commit data...
container_registry Loading commit data...
customization Loading commit data...
development Loading commit data...
downgrade_ee_to_ce Loading commit data...
gitlab-basics Loading commit data...
hooks Loading commit data...
incoming_email Loading commit data...
install Loading commit data...
integration Loading commit data...
intro Loading commit data...
legal Loading commit data...
logs Loading commit data...
markdown Loading commit data...
migrate_ci_to_ce Loading commit data...
monitoring Loading commit data...
operations Loading commit data...
permissions Loading commit data...
profile Loading commit data...
project_services Loading commit data...
public_access Loading commit data...
raketasks Loading commit data...
security Loading commit data...
ssh Loading commit data...
system_hooks Loading commit data...
update Loading commit data...
web_hooks Loading commit data...
workflow Loading commit data...
README.md Loading commit data...