diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index b5ac9406a..04e68ff3d 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -194,7 +194,7 @@ func TestCantMergeWorkInProgress(t *testing.T) { req := NewRequest(t, "GET", resp.Header().Get("Location")) resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - text := strings.TrimSpace(htmlDoc.doc.Find(".attached.header > .text.grey").Last().Text()) + text := strings.TrimSpace(htmlDoc.doc.Find(".attached.merge-section.no-header > .text.grey").Last().Text()) assert.NotEmpty(t, text, "Can't find WIP text") // remove from lang diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 3aee0773f..a5d753ac0 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -75,7 +75,7 @@ {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}
{{template "repo/pulls/status" .}} -
+
{{if .Issue.PullRequest.HasMerged}}
{{if .Issue.PullRequest.MergedCommitID}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 388e2713d..f04ce05a9 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -919,8 +919,20 @@ } > .merge-section { - border-top: 1px solid #d4d4d5; background-color: #f7f7f7; + + .item + .item { + padding-top: .5rem; + } + + .divider { + margin-left: -1rem; + margin-right: -1rem; + } + + &.no-header { + #avatar-arrow; + } } .markdown {