summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/alecthomas/chroma/lexers/l
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-12-20 00:32:54 +0000
committerGitHub <noreply@github.com>2021-12-20 08:32:54 +0800
commite4e411821d985cf8f9007d9640909ab9ee271dd7 (patch)
tree11af3c3a933949d0561f1e292acd8296181a63db /vendor/github.com/alecthomas/chroma/lexers/l
parentb24a965b81d5aa4e7bd87c6a4c6370d7e0ec9a50 (diff)
downloadgitea-e4e411821d985cf8f9007d9640909ab9ee271dd7.tar.gz
gitea-e4e411821d985cf8f9007d9640909ab9ee271dd7.zip
Abort merge if head has been updated before pressing merge (#18032)
* Abort merge if head has been updated before pressing merge It is possible that a PR head may be pushed to between the merge page being shown and the merge button being pressed. Pass the current expected head in as a parameter and cancel the merge if it has changed. Fix #18028 Signed-off-by: Andrew Thornton <art27@cantab.net> * adjust swagger Signed-off-by: Andrew Thornton <art27@cantab.net> * fix test Signed-off-by: Andrew Thornton <art27@cantab.net> * placate lint Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'vendor/github.com/alecthomas/chroma/lexers/l')
0 files changed, 0 insertions, 0 deletions