Skip to content

Commit 7478527

Browse files
committed
Merge branch 'fix-14908-labels-not-in-repository-part-1' of github.com:zeripath/gitea into fix-14908-labels-not-in-repository-part-1
2 parents e669f65 + d0c5791 commit 7478527

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

models/user.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,7 @@ var (
789789
"assets",
790790
"attachments",
791791
"avatars",
792+
"captcha",
792793
"commits",
793794
"debug",
794795
"error",

templates/repo/header.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</div>
8484
</form>
8585
{{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
86-
<div class="ui labeled button" tabindex="0">
86+
<div class="ui labeled button {{if not $.IsSigned}} disabled{{end}}" tabindex="0">
8787
<a class="ui compact small basic button {{if or (not $.IsSigned) (not $.CanSignedUserFork)}}poping up{{end}}" {{if $.CanSignedUserFork}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else if $.IsSigned}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" {{ else }} data-content="{{$.i18n.Tr "repo.fork_guest_user" }}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{AppSubUrl}}/repo/fork/{{.ID}}" {{end}} data-position="top center" data-variation="tiny">
8888
{{svg "octicon-repo-forked"}}{{$.i18n.Tr "repo.fork"}}
8989
</a>

web_src/less/_repository.less

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2768,12 +2768,17 @@ tbody.commit-list {
27682768

27692769
.commit-body {
27702770
white-space: pre-wrap;
2771+
line-height: initial;
27712772
}
27722773

27732774
.repository:not(.diff) {
2774-
.commit-body {
2775+
.commit-body { // commit history list
27752776
margin: 0;
27762777
}
2778+
2779+
.timeline-item .commit-body { // PR-comment
2780+
margin-left: 40px;
2781+
}
27772782
}
27782783

27792784
.git-notes.top {

0 commit comments

Comments
 (0)