diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-12-10 10:59:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 03:59:05 +0100 |
| commit | 2d71cdb6687435cf91d23793b0d3fce9db9881a6 (patch) | |
| tree | b991f906b4112f65b73d23bb6a15afb3962e670e /web_src/js/index.js | |
| parent | c85bb6263503ebd335863f413214a775973a1fac (diff) | |
| download | gitea-2d71cdb6687435cf91d23793b0d3fce9db9881a6.tar.gz gitea-2d71cdb6687435cf91d23793b0d3fce9db9881a6.zip | |
Add pull request manually merge instruction (#13840)
* add pull request command line instructions
* Add pull request manually merge instuction
* Fix styles
* Fix lint
* Move inline style to class file
* add space between merge button and hint text
* Add sentence end charcter
* Change the language file
* adjust secondary bg
* further adjustment
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'web_src/js/index.js')
| -rw-r--r-- | web_src/js/index.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index 496495a1cd..0dc0a9273b 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1201,6 +1201,12 @@ async function initRepository() { } } +function initPullRequestMergeInstruction() { + $('.show-instruction').on('click', () => { + $('.instruct').toggle(); + }); +} + function initPullRequestReview() { if (window.location.hash && window.location.hash.startsWith('#issuecomment-')) { const commentDiv = $(window.location.hash); @@ -2526,6 +2532,7 @@ $(document).ready(async () => { initContextPopups(); initTableSort(); initNotificationsTable(); + initPullRequestMergeInstruction(); const routes = { 'div.user.settings': initUserSettings, |