Skip to content

Commit cc675ef

Browse files
committed
Merge remote-tracking branch 'upstream/release/v1.17' into codeberg-1.17
2 parents 35fa510 + 68cceb5 commit cc675ef

File tree

5 files changed

+50
-3
lines changed

5 files changed

+50
-3
lines changed

CHANGELOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,45 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7+
## [1.17.1](https://github.com/go-gitea/gitea/releases/tag/1.17.1) - 2022-08-17
8+
9+
* SECURITY
10+
* Correctly escape within tribute.js (#20831) (#20832)
11+
* ENHANCEMENTS
12+
* Add support for NuGet API keys (#20721) (#20734)
13+
* Display project in issue list (#20583)
14+
* Add disable download source configuration (#20548) (#20579)
15+
* Add username check to doctor (#20140) (#20671)
16+
* Enable Wire 2 for Internal SSH Server (#20616) (#20617)
17+
* BUGFIXES
18+
* Use the total issue count for UI (#20785) (#20827)
19+
* Add proxy host into allow list (#20798) (#20819)
20+
* Add missing translation for queue flush workers (#20791) (#20792)
21+
* Improve comment header for mobile (#20781) (#20789)
22+
* Fix git.Init for doctor sub-command (#20782) (#20783)
23+
* Check webhooks slice length before calling xorm (#20642) (#20768)
24+
* Remove manual rollback for failed generated repositories (#20639) (#20762)
25+
* Use correct field name in npm template (#20675) (#20760)
26+
* Keep download count on Container tag overwrite (#20728) (#20735)
27+
* Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702) (#20707)
28+
* Use request timeout for git service rpc (#20689) (#20693)
29+
* Send correct NuGet status codes (#20647) (#20677)
30+
* Use correct context to get package content (#20673) (#20676)
31+
* Fix the JS error "EventSource is not defined" caused by some non-standard browsers (#20584) (#20663)
32+
* Add default commit messages to PR for squash merge (#20618) (#20645)
33+
* Fix package upload for files >32mb (#20622) (#20635)
34+
* Fix the new-line copy-paste for rendered code (#20612)
35+
* Clean up and fix clone button script (#20415 & #20600) (#20599)
36+
* Fix default merge style (#20564) (#20565)
37+
* Add repository condition for issue count (#20454) (#20496)
38+
* Make branch icon stand out more (#20726) (#20774)
39+
* Fix loading button with invalid form (#20754) (#20759)
40+
* Fix SecToTime edge-cases (#20610) (#20611)
41+
* Executable check always returns true for windows (#20637) (#20835)
42+
* Check issue labels slice length before calling xorm Insert (#20655) (#20836)
43+
* Fix owners cannot create organization repos bug (#20841) (#20854)
44+
* Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) (#20848)
45+
746
## [1.17.0](https://github.com/go-gitea/gitea/releases/tag/v1.17.0) - 2022-07-30
847

948
* BREAKING

models/repo/mirror.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ func (repos MirrorRepositoryList) loadAttributes(ctx context.Context) error {
153153
}
154154
for i := range repos {
155155
repos[i].Mirror = set[repos[i].ID]
156-
repos[i].Mirror.Repo = repos[i]
156+
if repos[i].Mirror != nil {
157+
repos[i].Mirror.Repo = repos[i]
158+
}
157159
}
158160
return nil
159161
}

routers/api/v1/org/team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func EditTeam(ctx *context.APIContext) {
262262
}
263263

264264
if form.CanCreateOrgRepo != nil {
265-
team.CanCreateOrgRepo = *form.CanCreateOrgRepo
265+
team.CanCreateOrgRepo = team.IsOwnerTeam() || *form.CanCreateOrgRepo
266266
}
267267

268268
if len(form.Name) > 0 {

routers/web/org/teams.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,11 @@ func EditTeamPost(ctx *context.Context) {
416416
isIncludeAllChanged = true
417417
t.IncludesAllRepositories = includesAllRepositories
418418
}
419+
t.CanCreateOrgRepo = form.CanCreateOrgRepo
420+
} else {
421+
t.CanCreateOrgRepo = true
419422
}
423+
420424
t.Description = form.Description
421425
if t.AccessMode < perm.AccessModeAdmin {
422426
units := make([]organization.TeamUnit, 0, len(unitPerms))
@@ -433,7 +437,6 @@ func EditTeamPost(ctx *context.Context) {
433437
return
434438
}
435439
}
436-
t.CanCreateOrgRepo = form.CanCreateOrgRepo
437440

438441
if ctx.HasError() {
439442
ctx.HTML(http.StatusOK, tplTeamNew)

services/pull/update.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
8787
}
8888
headRepoPerm, err := access_model.GetUserRepoPermission(ctx, pull.HeadRepo, user)
8989
if err != nil {
90+
if repo_model.IsErrUnitTypeNotExist(err) {
91+
return false, false, nil
92+
}
9093
return false, false, err
9194
}
9295

0 commit comments

Comments
 (0)