File tree Expand file tree Collapse file tree 3 files changed +15
-3
lines changed
templates/repo/issue/view_content Expand file tree Collapse file tree 3 files changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -194,7 +194,7 @@ func TestCantMergeWorkInProgress(t *testing.T) {
194
194
req := NewRequest (t , "GET" , resp .Header ().Get ("Location" ))
195
195
resp = session .MakeRequest (t , req , http .StatusOK )
196
196
htmlDoc := NewHTMLParser (t , resp .Body )
197
- text := strings .TrimSpace (htmlDoc .doc .Find (".attached.header > .text.grey" ).Last ().Text ())
197
+ text := strings .TrimSpace (htmlDoc .doc .Find (".attached.merge-section.no- header > .text.grey" ).Last ().Text ())
198
198
assert .NotEmpty (t , text , "Can't find WIP text" )
199
199
200
200
// remove <strong /> from lang
Original file line number Diff line number Diff line change 75
75
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
76
76
<div class="content">
77
77
{{template "repo/pulls/status" .}}
78
- <div class="ui {{if not $.LatestCommitStatus}}top attached header{{else}}attached merge-section segment {{end}}">
78
+ <div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header {{end}}">
79
79
{{if .Issue.PullRequest.HasMerged}}
80
80
<div class="item text purple">
81
81
{{if .Issue.PullRequest.MergedCommitID}}
Original file line number Diff line number Diff line change 919
919
}
920
920
921
921
> .merge-section {
922
- border-top : 1px solid #d4d4d5 ;
923
922
background-color : #f7f7f7 ;
923
+
924
+ .item + .item {
925
+ padding-top : .5rem ;
926
+ }
927
+
928
+ .divider {
929
+ margin-left : -1rem ;
930
+ margin-right : -1rem ;
931
+ }
932
+
933
+ & .no-header {
934
+ #avatar-arrow ;
935
+ }
924
936
}
925
937
926
938
.markdown {
You can’t perform that action at this time.
0 commit comments