3 Commits

Author	SHA1	Message	Date
wxiaoguang	a1460333dc	Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) (#23825) ... Backport #23790 Fix regression of #22683 Pass all variables into sub-template. Close #23787	2023-03-31 12:15:51 +08:00
zeripath	51383ec084	Move helpers to be prefixed with `gt-` (#22879) ... As discussed in #22847 the helpers in helpers.less need to have a separate prefix as they are causing conflicts with fomantic styles This will allow us to have the `.gt-hidden { display:none !important; }` style that is needed to for the reverted PR. Of note in doing this I have noticed that there was already a conflict with at least one chroma style which this PR now avoids. I've also added in the `gt-hidden` style that matches the tailwind one and switched the code that needed it to use that. Signed-off-by: Andrew Thornton <art27@cantab.net> --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	2023-02-13 17:59:59 +00:00
jladbrook	891391689a	Update button is shown when a Pull Request is marked WIP - Issue #21740 (#22683) ... Fix #21740. Updated the Pull Request template so that the 'Update branch by merge' button is visible for WIP PR's. Making the behaviour match a non WIP-PR. Previous WIP page with changes pending on the branch:  Updated UI adding the update button:  ## Notes * have not removed the **$canAutoMerge** variable from the pull.tmpl on this [line](36dc11869d/templates/repo/issue/view_content/pull.tmpl (L131)) - doesn't appear to be used elsewhere but wasn't sure * In order to avoid duplicating code corresponding UI code was added to a new tmpl file, ```update_branch_by_merge.tmpl``` and is called in two places from ```pull.tmpl```. --------- Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>	2023-02-03 14:24:45 +08:00