Skip to content

Commit 2f44bb0

Browse files
65436543
authored
Merge branch 'master' into api_admin-edit-user_optional-values
2 parents 84375ab + 702e82d commit 2f44bb0

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

‎docs/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params:
1818
description: Git with a cup of tea
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
21-
version: 1.12.5
21+
version: 1.12.6
2222
minGoVersion: 1.13
2323
goVersion: 1.15
2424
minNodeVersion: 10.13

‎docs/content/doc/installation/with-docker.en-us.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ networks:
4242

4343
services:
4444
server:
45-
image: gitea/gitea:latest
45+
image: gitea/gitea:{{< version >}}
4646
container_name: gitea
4747
environment:
4848
- USER_UID=1000
@@ -74,7 +74,7 @@ networks:
7474

7575
services:
7676
server:
77-
image: gitea/gitea:latest
77+
image: gitea/gitea:{{< version >}}
7878
container_name: gitea
7979
environment:
8080
- USER_UID=1000
@@ -107,7 +107,7 @@ networks:
107107

108108
services:
109109
server:
110-
image: gitea/gitea:latest
110+
image: gitea/gitea:{{< version >}}
111111
container_name: gitea
112112
environment:
113113
- USER_UID=1000
@@ -158,7 +158,7 @@ networks:
158158

159159
services:
160160
server:
161-
image: gitea/gitea:latest
161+
image: gitea/gitea:{{< version >}}
162162
container_name: gitea
163163
environment:
164164
- USER_UID=1000
@@ -214,7 +214,7 @@ networks:
214214
+
215215
services:
216216
server:
217-
image: gitea/gitea:latest
217+
image: gitea/gitea:{{< version >}}
218218
container_name: gitea
219219
restart: always
220220
networks:
@@ -315,7 +315,7 @@ version: "3"
315315
316316
services:
317317
server:
318-
image: gitea/gitea:latest
318+
image: gitea/gitea:{{< version >}}
319319
container_name: gitea
320320
environment:
321321
- USER_UID=1000

‎routers/repo/issue.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
131131
posterID = ctx.User.ID
132132
case "mentioned":
133133
mentionedID = ctx.User.ID
134+
case "assigned":
135+
assigneeID = ctx.User.ID
134136
}
135137
}
136138

‎templates/repo/issue/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</span>
9494
<div class="menu">
9595
<a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.all_issues"}}</a>
96-
<a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{.SignedUser.ID}}">{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}</a>
96+
<a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}</a>
9797
<a class="{{if eq .ViewType "created_by"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=created_by&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}</a>
9898
<a class="{{if eq .ViewType "mentioned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=mentioned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}</a>
9999
</div>

‎templates/repo/issue/milestone_issues.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</span>
9292
<div class="menu">
9393
<a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.all_issues"}}</a>
94-
<a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{.SignedUser.ID}}">{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}</a>
94+
<a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}</a>
9595
<a class="{{if eq .ViewType "created_by"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=created_by&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}</a>
9696
<a class="{{if eq .ViewType "mentioned"}}active{{end}} item" href="{{$.Link}}?q={{$.Keyword}}&type=mentioned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}</a>
9797
</div>

0 commit comments

Comments
 (0)