git724/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Add pull request manually merge instruction (#13840)

Browse source 
* 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>
This commit is contained in:
Lunny Xiao 2020-12-10 10:59:05 +08:00 • committed by GitHub
parent c85bb62635
commit 2d71cdb668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 78 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
web_src/js/index.js
View file

@ -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,