The Unified and Autonomous Development Platform
chore: Minor UI bug fix
Robin Shen96a4e2201246
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.javaindex dca107c5b9..a0a21bc096 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java@@ -767,7 +767,7 @@ public class DefaultDataManager implements DataManager, Serializable {setting = settingManager.findSetting(Key.ISSUE);if (setting == null) {LinkSpec link = new LinkSpec();- link.setName("Child Issue");+ link.setName("Sub Issues");link.setMultiple(true);link.setOpposite(new LinkSpecOpposite());link.getOpposite().setName("Parent Issue");diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 707611de4e..15a0b2e863 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -162,7 +162,7 @@ public class GlobalIssueSetting implements Serializable {manualSpec.setFromStates(Lists.newArrayList("Open"));manualSpec.setToStates(Lists.newArrayList("Closed"));manualSpec.setAuthorizedRoles(Lists.newArrayList("Code Writer", ManualSpec.ROLE_SUBMITTER, "{Assignee}"));- manualSpec.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Child Issue\" matching(\"State\" is \"Open\"))");+ manualSpec.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Sub Issues\" matching(\"State\" is \"Open\"))");transitionSpecs.add(manualSpec);@@ -177,7 +177,7 @@ public class GlobalIssueSetting implements Serializable {issueStateTransitedSpec.setFromStates(Lists.newArrayList("Open"));issueStateTransitedSpec.setToState("Closed");issueStateTransitedSpec.setStates(Lists.newArrayList("Closed"));- issueStateTransitedSpec.setIssueQuery("any \"Child Issue\" matching(current issue) and all \"Child Issue\" matching(\"State\" is \"Closed\")");+ issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) and all \"Sub Issues\" matching(\"State\" is \"Closed\")");transitionSpecs.add(issueStateTransitedSpec);@@ -192,7 +192,7 @@ public class GlobalIssueSetting implements Serializable {issueStateTransitedSpec.setFromStates(Lists.newArrayList("Closed"));issueStateTransitedSpec.setToState("Open");issueStateTransitedSpec.setStates(Lists.newArrayList("Open"));- issueStateTransitedSpec.setIssueQuery("any \"Child Issue\" matching(current issue) or any \"Blocked By\" matching(current issue)");+ issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) or any \"Blocked By\" matching(current issue)");transitionSpecs.add(issueStateTransitedSpec);@@ -206,7 +206,7 @@ public class GlobalIssueSetting implements Serializable {board.setIdentifyField(Issue.NAME_STATE);board.setColumns(Lists.newArrayList("Open", "Closed"));board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignee", IssueSchedule.NAME_ITERATION));- board.setDisplayLinks(Lists.newArrayList("Child Issue", "Parent Issue", "Blocked By", "Blocks", "Related"));+ board.setDisplayLinks(Lists.newArrayList("Sub Issues", "Parent Issue", "Blocked By", "Blocks", "Related"));boardSpecs.add(board);listFields.add(Issue.NAME_STATE);@@ -215,7 +215,7 @@ public class GlobalIssueSetting implements Serializable {listFields.add("Assignee");listFields.add(IssueSchedule.NAME_ITERATION);- listLinks.add("Child Issue");+ listLinks.add("Sub Issues");listLinks.add("Parent Issue");listLinks.add("Blocked By");listLinks.add("Blocks");@@ -228,7 +228,7 @@ public class GlobalIssueSetting implements Serializable {namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));namedQueries.add(new NamedIssueQuery("Mentioned me", "mentioned me"));- namedQueries.add(new NamedIssueQuery("Blocked issues", "any \"Blocked By\" matching(\"State\" is \"Open\") or any \"Child Issue\" matching(\"State\" is \"Open\")"));+ namedQueries.add(new NamedIssueQuery("Blocked issues", "any \"Blocked By\" matching(\"State\" is \"Open\") or any \"Sub Issues\" matching(\"State\" is \"Open\")"));namedQueries.add(new NamedIssueQuery("Has activity recently", "\"Last Activity Date\" is since \"last week\""));namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignee\" is empty"));@@ -246,7 +246,7 @@ public class GlobalIssueSetting implements Serializable {entry.setSuffix("\\s*\\)\\s*$");commitMessageFixPatterns.getEntries().add(entry);- timeTrackingSetting.setAggregationLink("Child Issue");+ timeTrackingSetting.setAggregationLink("Sub Issues");}public List<String> sortFieldNames(Collection<String> fieldNames) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.javaindex 4a0c4d421e..427857c381 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java@@ -23,7 +23,7 @@ public class LinkSpecOpposite implements Serializable {private String issueQuery;@Editable(order=100, name="Name On the Other Side", description="Name of the link on the other side. "- + "For instance if name is <tt>child issues</tt>, name on the other side can be <tt>parent issue</tt>")+ + "For instance if name is <tt>sub issues</tt>, name on the other side can be <tt>parent issue</tt>")@NotEmptypublic String getName() {return name;@@ -34,7 +34,7 @@ public class LinkSpecOpposite implements Serializable {}@Editable(order=200, name="Multiple On the Other Side", description="Whether or not multiple issues can be linked "- + "on the other side. For instance child issues on the other side means parent issue, and multiple should "+ + "on the other side. For instance sub issues on the other side means parent issue, and multiple should "+ "be false on that side if only one parent is allowed")public boolean isMultiple() {return multiple;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.jsindex 46d2d2e5ec..76004dcd12 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/blob-text-diff.js@@ -775,7 +775,7 @@ onedev.server.blobTextDiff = {var $content = $(`<div><a class='permanent'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#link'/></svg> Permanent link of this selection</a>`);$content.children("a.permanent").attr("href", markUrl);$content.append(`<a class='copy-marked'><svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#copy'/></svg> Copy selected text to clipboard</a>`);- var clipboard = new Clipboard(".copy-marked", {+ var clipboard = new ClipboardJS(".copy-marked", {text: function(trigger) {return markedText;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.htmlindex 16070e22e2..6fe90d9b7a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.html@@ -1,9 +1,9 @@<wicket:panel><div class="d-flex">- <div class="avatar mr-3">+ <div class="avatar mr-3 flex-shrink-0"><span wicket:id="avatar"></span></div>- <div class="detail">+ <div class="detail flex-grow-1"><div class="head mb-3"><span wicket:id="name"></span> commented <span wicket:id="age"></span><a wicket:id="anchor" class="activity-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.htmlindex 5621864303..7cfbd3d4f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html@@ -1,12 +1,10 @@<wicket:panel>- <div class="issue-primary">- <div class="border border-dashed border-primary rounded p-4">- <div class="mb-3">- <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span> <span wicket:id="submitOnBehalfOf"></span>- </div>- <div wicket:id="description"></div>- </div>- <ul wicket:id="links" class="links list-unstyled mt-5 mb-0">+ <div class="issue-primary border border-dashed border-primary rounded p-4">+ <div class="mb-3">+ <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span> <span wicket:id="submitOnBehalfOf"></span>+ </div>+ <div wicket:id="description"></div>+ <ul wicket:id="links" class="links list-unstyled mt-4 mb-0 border-top pt-4"><li wicket:id="links" class="mb-4 mb-last-child-0"><div class="head d-flex align-items-center h6 dropdown-aware"><span wicket:id="name" class="flex-shrink-0 mr-2"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex a6f50343ec..20e832ee5d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -441,6 +441,14 @@text-decoration: none;}+/*+ * Use fixed table layout to force rendered code pre to show horizontal scroll bar+ */+.markdown-editor, .markdown-viewer {+ display: table;+ table-layout: fixed;+ width: 100%;+}.markdown-rendered a {color: var(--primary);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex c21aa1f90f..3352265a93 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -1094,11 +1094,15 @@ onedev.server.markdown = {var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#copy'/></svg>";var $copy = $("<a class='pressable' title='Copy to clipboard'>" + icon + "</a>");$actions.append($copy);- new Clipboard($copy[0], {+ var options = {text: function() {return $this.text();}- });+ };+ var $modal = $copy.closest(".modal-dialog");+ if ($modal.length != 0)+ options.container = $modal[0];+ new ClipboardJS($copy[0], options);}var suggestionCallback = $container.data("suggestionCallback");diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.htmlindex 828553a7a0..d1dd394860 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html@@ -2,7 +2,7 @@<div class="issue-links"><div class="text-muted mb-4"><wicket:svg href="bulb" class="icon"/> Links can be used to associate different issues. For instance, an issue can be linked to- child issues or blocking issues+ sub issues or related issues</div><a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue link"><wicket:svg href="plus" class="icon"></wicket:svg></a><table wicket:id="links" class="table table-hover"></table>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.jsindex d850f21594..b4052a5a6f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js@@ -398,7 +398,7 @@ onedev.server.sourceView = {$content.children("a.permanent").attr("href", selectionUrl);svg = `<svg class='icon mr-1'><use xlink:href='${onedev.server.icons}#copy'/></svg>`;$content.append(`<a class='copy-marked'>${svg} Copy selected text to clipboard</a>`);- var clipboard = new Clipboard(".copy-marked", {+ var clipboard = new ClipboardJS(".copy-marked", {text: function() {return cm.getSelection("\n");}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 21b617895f..6b3410b3b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -25,87 +25,89 @@<a wicket:id="clone" title="Check out to local workspace" class="btn btn-primary btn-icon mr-3"><wicket:svg href="download2" class="icon"></wicket:svg></a><a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a></div>- <div wicket:id="description" class="description border border-dashed border-primary rounded p-4 mb-5">- <div class="mb-3">- <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span>- </div>- <div wicket:id="content"></div>- </div>- <div wicket:id="requestSummary" class="summary p-4 mb-4 font-size-h6 border border-dashed border-primary rounded">- <wicket:enclosure>- <div class="text-warning">- <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>- </div>- </wicket:enclosure>- <div wicket:id="discarded" class="discarded text-info">- <wicket:svg href="info-circle" class="icon"></wicket:svg> This pull request has been discarded- </div>- <div wicket:id="fastForwarded" class="fast-forwarded text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Target branch was fast-forwarded to source branch- </div>- <div wicket:id="merged" class="merged text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch- </div>- <div wicket:id="mergedOutside" class="merged-outside text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch outside of this pull request- </div>- <div wicket:id="squashed" class="squashed text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were squashed into a single commit on target branch- </div>- <div wicket:id="rebased" class="rebased text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were rebased onto target branch- </div>- <div wicket:id="sourceBranchOutdated" class="source-branch-outdated text-primary">- <wicket:svg href="info-circle" class="icon"></wicket:svg> Source branch is outdated <a wicket:id="detail" class="link-primary" title="Show changes"><wicket:svg href="diff2" class="icon"/></a>- </div>- <div wicket:id="calculatingMergePreview" class="calculating-merge-preview text-warning d-flex align-items-center">- <wicket:svg href="loading" class="icon spin mr-2"></wicket:svg> Calculating merge preview...- </div>- <div wicket:id="calculatedMergePreview" class="calculated-merge-preview text-success">- <wicket:svg href="tick-circle" class="icon"></wicket:svg> Able to merge without conflicts- </div>- <div wicket:id="hasMergeConflict" class="has-merge-conflict text-warning">- <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.- <wicket:enclosure child="resolveInstructions">- Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts+ <div class="primary border border-dashed border-primary rounded p-4 mb-4">+ <div wicket:id="description" class="description">+ <div class="mb-3">+ <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span>+ </div>+ <div wicket:id="content"></div>+ </div>+ <div wicket:id="requestSummary" class="summary font-size-h6 border-top pt-4 mt-4">+ <wicket:enclosure>+ <div class="text-warning">+ <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>+ </div></wicket:enclosure>- </div>- <div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-warning">- <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit- </div>- <div wicket:id="requestedForChanges" class="requested-for-changes text-warning">- <wicket:svg href="diff" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>- </div>- <div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">- <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>- </div>- <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds text-warning">- <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">some required builds</a> are not successful- </div>- <div wicket:id="unfinishedBuilds" class="unfinished-builds text-warning">- <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">some required builds</a> are not finished yet- </div>- <wicket:enclosure child="commitMessageCheckError">- <div class="invalid-commit-messages text-warning">- <wicket:svg href="times-circle" class="icon"></wicket:svg> <span wicket:id="commitMessageCheckError"></span>- </div>- </wicket:enclosure>- <wicket:enclosure child="requiredJobs">- <div class="required-jobs text-warning">- <wicket:svg href="warning" class="icon"></wicket:svg>- <span wicket:id="requiredJobsMessage"></span>- <span wicket:id="requiredJobs" class="d-inline-block mr-2">- <span wicket:id="jobName"></span>- <a wicket:id="runJob" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>- </span>- </div>- </wicket:enclosure>- <div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info">- <wicket:svg href="info-circle" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission- </div>- <div wicket:id="contributions" class="contribution">- <div wicket:id="head" class="head font-weight-bold mb-2 "></div>- <div wicket:id="body" class="body"></div>+ <div wicket:id="discarded" class="discarded text-info">+ <wicket:svg href="info-circle" class="icon"></wicket:svg> This pull request has been discarded+ </div>+ <div wicket:id="fastForwarded" class="fast-forwarded text-success">+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Target branch was fast-forwarded to source branch+ </div>+ <div wicket:id="merged" class="merged text-success">+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch+ </div>+ <div wicket:id="mergedOutside" class="merged-outside text-success">+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were merged into target branch outside of this pull request+ </div>+ <div wicket:id="squashed" class="squashed text-success">+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were squashed into a single commit on target branch+ </div>+ <div wicket:id="rebased" class="rebased text-success">+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Commits were rebased onto target branch+ </div>+ <div wicket:id="sourceBranchOutdated" class="source-branch-outdated text-primary">+ <wicket:svg href="info-circle" class="icon"></wicket:svg> Source branch is outdated <a wicket:id="detail" class="link-primary" title="Show changes"><wicket:svg href="diff2" class="icon"/></a>+ </div>+ <div wicket:id="calculatingMergePreview" class="calculating-merge-preview text-warning d-flex align-items-center">+ <wicket:svg href="loading" class="icon spin mr-2"></wicket:svg> Calculating merge preview...+ </div>+ <div wicket:id="calculatedMergePreview" class="calculated-merge-preview text-success">+ <wicket:svg href="tick-circle" class="icon"></wicket:svg> Able to merge without conflicts+ </div>+ <div wicket:id="hasMergeConflict" class="has-merge-conflict text-warning">+ <wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.+ <wicket:enclosure child="resolveInstructions">+ Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts+ </wicket:enclosure>+ </div>+ <div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-warning">+ <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit+ </div>+ <div wicket:id="requestedForChanges" class="requested-for-changes text-warning">+ <wicket:svg href="diff" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>+ </div>+ <div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">+ <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>+ </div>+ <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds text-warning">+ <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">some required builds</a> are not successful+ </div>+ <div wicket:id="unfinishedBuilds" class="unfinished-builds text-warning">+ <wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">some required builds</a> are not finished yet+ </div>+ <wicket:enclosure child="commitMessageCheckError">+ <div class="invalid-commit-messages text-warning">+ <wicket:svg href="times-circle" class="icon"></wicket:svg> <span wicket:id="commitMessageCheckError"></span>+ </div>+ </wicket:enclosure>+ <wicket:enclosure child="requiredJobs">+ <div class="required-jobs text-warning">+ <wicket:svg href="warning" class="icon"></wicket:svg>+ <span wicket:id="requiredJobsMessage"></span>+ <span wicket:id="requiredJobs" class="d-inline-block mr-2">+ <span wicket:id="jobName"></span>+ <a wicket:id="runJob" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>+ </span>+ </div>+ </wicket:enclosure>+ <div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info">+ <wicket:svg href="info-circle" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission+ </div>+ <div wicket:id="contributions" class="contribution">+ <div wicket:id="head" class="head font-weight-bold mb-2 "></div>+ <div wicket:id="body" class="body"></div>+ </div></div></div><div wicket:id="requestOperations" class="operations">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.htmlindex 3d354048b5..13806ec271 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.html@@ -1,9 +1,9 @@<wicket:panel><div class="d-flex">- <div class="avatar mr-3">+ <div class="avatar mr-3 flex-shrink-0"><span wicket:id="avatar"></span></div>- <div class="detail">+ <div class="detail flex-grow-1"><div class="head mb-3"><span wicket:id="name"></span> commented <span wicket:id="age"></span><a wicket:id="changes" title="Changes since this comment" class="since-changes ml-2"><wicket:svg href="diff" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 3e62f1f2d8..6499fe8c89 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -4,54 +4,49 @@.pull-request-detail>.card-body>.main>.status-bar>.status {font-size: 1rem;}-.pull-request-detail>.card-body>.main>.description {- border-bottom: none !important;+.pull-request-detail>.card-body>.main>.primary>.description {margin-bottom: 0 !important;- border-radius: 0.42rem 0.42rem 0 0 !important;}-.pull-request-detail>.card-body>.main>.summary {- border-radius: 0 0 0.42rem 0.42rem !important;-}-.pull-request-detail>.card-body>.main>.summary>div {+.pull-request-detail>.card-body>.main>.primary>.summary>div {margin-bottom: 1rem;}-.pull-request-detail>.card-body>.main>.summary>div:last-child {+.pull-request-detail>.card-body>.main>.primary>.summary>div:last-child {margin-bottom: 0;}.pull-request-detail>.card-body>.main>.operations>a {margin-bottom: 1.2rem;margin-right: 0.5rem;}-.pull-request-detail>.card-body>.main>.summary .icon {+.pull-request-detail>.card-body>.main>.primary>.summary .icon {width: 20px;height: 20px;margin-right: 6px;flex-shrink: 0;}-.pull-request-detail>.card-body>.main>.summary .icon.spin {+.pull-request-detail>.card-body>.main>.primary>.summary .icon.spin {width: 24px;height: 24px;margin-left: -2px;margin-right: 4px;}-.pull-request-detail>.card-body>.main>.summary .required-jobs .icon {+.pull-request-detail>.card-body>.main>.primary>.summary .required-jobs .icon {width: 16px;height: 16px;margin-bottom: 1px;}-.pull-request-detail>.card-body>.main>.summary .source-branch-outdated a>.icon {+.pull-request-detail>.card-body>.main>.primary>.summary .source-branch-outdated a>.icon {width: 16px;height: 16px;margin-bottom: 2px;}-.pull-request-detail>.card-body>.main>.summary>.contribution {+.pull-request-detail>.card-body>.main>.primary>.summary>.contribution {border-top: 1px dashed var(--light-gray);padding-top: 1rem;margin-top: 1rem;font-size: 1rem !important;}-.dark-mode .pull-request-detail>.card-body>.main>.summary>.contribution {+.dark-mode .pull-request-detail>.card-body>.main>.primary>.summary>.contribution {border-top-color: var(--dark-mode-dark-gray);}@@ -73,9 +68,9 @@ ul>li>a.code-comments.new .icon {}@media(min-width: 992px) {- html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.summary .more-info,- html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.summary .more-info:hover,- html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.summary .more-info:focus {+ html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.primary>.summary .more-info,+ html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.primary>.summary .more-info:hover,+ html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.primary>.summary .more-info:focus {color: inherit !important;cursor: inherit !important;}diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex 16be64e4e3..02bbe7e63b 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -677,11 +677,11 @@ public class ImportServer implements Serializable, Validatable {for (JsonNode subtaskNode: fieldsNode.get("subtasks"))subtasks.add(subtaskNode.get("key").asText());if (!subtasks.isEmpty())- extraIssueInfo.put("Sub Tasks", StringUtils.join(subtasks, "<br>"));+ extraIssueInfo.put("Sub Issues", StringUtils.join(subtasks, "<br>"));}if (fieldsNode.hasNonNull("parent"))- extraIssueInfo.put("Parent Task", fieldsNode.get("parent").get("key").asText());+ extraIssueInfo.put("Parent Issue", fieldsNode.get("parent").get("key").asText());if (fieldsNode.hasNonNull("issuelinks")) {Map<String, List<String>> issueLinks = new LinkedHashMap<>();