diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 85250c1627..decd8ce595 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1913,7 +1913,7 @@ pulls.close = Close pull request pulls.closed_at = `closed this pull request %[2]s` pulls.reopened_at = `reopened this pull request %[2]s` pulls.commit_ref_at = `referenced this pull request from a commit %[2]s` -pulls.cmd_instruction_hint = `View command line instructions.` +pulls.cmd_instruction_hint = `View command line instructions.` pulls.cmd_instruction_checkout_title = Checkout pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes. pulls.cmd_instruction_merge_title = Merge diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index d585d36574..42d9c82935 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -1,6 +1,6 @@
-
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}
-
+
+ {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}

{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}

{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}
{{$localBranch := .PullRequest.HeadBranch}} {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}} @@ -46,4 +46,4 @@
git push origin {{.PullRequest.BaseBranch}}
{{end}} - + diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index dfbc45dd61..d127c2ef24 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -60,7 +60,7 @@ {{end}} {{svg "octicon-download"}} - {{svg "octicon-copy" 14}} + {{svg "octicon-copy" 14}} {{if .EnableFeed}} {{if .IsViewBranch}} diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 8d057e37a9..be1fab1f6a 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -275,12 +275,6 @@ export function initRepoPullRequestUpdate() { }); } -export function initRepoPullRequestMergeInstruction() { - $('.show-instruction').on('click', () => { - toggleElem($('.instruct-content')); - }); -} - export function initRepoPullRequestAllowMaintainerEdit() { const wrapper = document.getElementById('allow-edits-from-maintainers'); if (!wrapper) return; diff --git a/web_src/js/index.js b/web_src/js/index.js index 4c707486bd..5a21dc36cd 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -30,7 +30,6 @@ import { initRepoIssueReferenceRepositorySearch, initRepoIssueTimeTracking, initRepoIssueWipTitle, - initRepoPullRequestMergeInstruction, initRepoPullRequestAllowMaintainerEdit, initRepoPullRequestReview, initRepoIssueSidebarList, initArchivedLabelHandler, } from './features/repo-issue.js'; @@ -160,7 +159,6 @@ onDomReady(() => { initRepoMigration(); initRepoMigrationStatusChecker(); initRepoProject(); - initRepoPullRequestMergeInstruction(); initRepoPullRequestAllowMaintainerEdit(); initRepoPullRequestReview(); initRepoRelease();