Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "Allow edits from maintainer" feature #18002

Merged
merged 122 commits into from
Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
a30c4d0
Add basic logifc for allow edits by maintainers feature and allow upd…
qwerty287 Dec 14, 2021
fe06546
Add "Allow edits from maintainer" feature
qwerty287 Dec 16, 2021
ff92170
Merge branch 'main' into allow-edits
qwerty287 Dec 16, 2021
d9ae6cf
Fix security issue
qwerty287 Dec 16, 2021
2efd678
Merge branch 'main' into allow-edits
qwerty287 Dec 16, 2021
bc5f4d0
fmt
qwerty287 Dec 16, 2021
44d7b25
Fix typo
qwerty287 Dec 16, 2021
bf2244a
Resolve TODO
qwerty287 Dec 16, 2021
298f912
Update web_src/js/features/repo-issue.js
qwerty287 Dec 17, 2021
4f2f34a
Merge branch 'main' into allow-edits
qwerty287 Dec 17, 2021
b4dbc8d
Rm debug code
qwerty287 Dec 17, 2021
111896c
Update desc
qwerty287 Dec 17, 2021
594d277
Rm var
qwerty287 Dec 17, 2021
c30bdc3
Disable JS on new PR
qwerty287 Dec 17, 2021
4c7f2ba
Use var to save url
qwerty287 Dec 17, 2021
f086784
Show error popup if failed
qwerty287 Dec 17, 2021
17f0729
Fix lint
qwerty287 Dec 17, 2021
31ff678
Fix js
qwerty287 Dec 17, 2021
9f60458
Merge branch 'main' into allow-edits
qwerty287 Dec 20, 2021
9e475a7
Merge branch 'main' into allow-edits
qwerty287 Dec 21, 2021
f5f208e
Hide optin if pr is closed
qwerty287 Dec 21, 2021
2f912a2
Remove `nil` check
qwerty287 Dec 21, 2021
b010961
Move checkbox into segment
qwerty287 Dec 21, 2021
ad83a25
Apply suggestions from code review
qwerty287 Dec 22, 2021
2feff0b
len() check
qwerty287 Dec 22, 2021
ac654e3
Merge branch 'allow-edits' of github.com:qwerty287/gitea into allow-e…
qwerty287 Dec 22, 2021
7c5e39c
Merge branch 'main' into allow-edits
qwerty287 Jan 7, 2022
819d679
fmt
qwerty287 Jan 7, 2022
c6e2a02
Fix permissions
qwerty287 Jan 7, 2022
f4a0983
Use not null default true
qwerty287 Jan 7, 2022
e55c639
methods -> funcs
qwerty287 Jan 7, 2022
fb2ff38
Merge branch 'main' into allow-edits
qwerty287 Jan 9, 2022
4d5b073
Rename
qwerty287 Jan 14, 2022
cd6ba30
Merge branch 'main' into allow-edits
qwerty287 Jan 14, 2022
d21701f
fmt
qwerty287 Jan 18, 2022
0a12828
Merge branch 'main' into allow-edits
qwerty287 Jan 18, 2022
1642c2f
Merge branch 'main' into allow-edits
qwerty287 Jan 19, 2022
f0b688f
fmt
qwerty287 Jan 19, 2022
6949086
Merge branch 'allow-edits' of github.com:qwerty287/gitea into allow-e…
qwerty287 Jan 19, 2022
9b68464
Merge branch 'main' into allow-edits
qwerty287 Jan 22, 2022
e564c33
Merge branch 'main' into allow-edits
qwerty287 Jan 25, 2022
bdfe2fd
Merge branch 'allow-edits' of github.com:qwerty287/gitea into allow-e…
qwerty287 Jan 25, 2022
59bda50
Update col name
qwerty287 Jan 26, 2022
a93a7b7
Merge branch 'main' into allow-edits
qwerty287 Jan 26, 2022
1f7825b
Merge branch 'main' into allow-edits
6543 Jan 27, 2022
cd7981d
Merge branch 'main' into allow-edits
6543 Jan 31, 2022
f581696
Merge branch 'main' into allow-edits
qwerty287 Feb 5, 2022
d22e233
Merge branch 'main' into allow-edits
wxiaoguang Feb 7, 2022
1012a62
Merge branch 'main' into allow-edits
qwerty287 Feb 7, 2022
b689ae3
Merge branch 'allow-edits' of github.com:qwerty287/gitea into allow-e…
qwerty287 Feb 7, 2022
7add045
Fix 500 + disable checkbox
qwerty287 Feb 7, 2022
9cd6a2c
Fix lint
qwerty287 Feb 7, 2022
870ebf0
Merge branch 'main' into allow-edits
qwerty287 Feb 14, 2022
4e13dfc
Fix branch perms values
qwerty287 Feb 14, 2022
dfe968b
Merge branch 'main' into allow-edits
6543 Feb 14, 2022
af05be8
Handle casting error
qwerty287 Feb 14, 2022
ce93b59
Merge branch 'main' into allow-edits
qwerty287 Feb 15, 2022
ae5b39e
Use single endpoint and update popup
qwerty287 Feb 15, 2022
9a31150
Update API endpoints
qwerty287 Feb 15, 2022
ec88ad9
Rm dupl loading
qwerty287 Feb 19, 2022
6e55f66
Merge branch 'main' into allow-edits
qwerty287 Feb 19, 2022
2c041e1
Merge branch 'main' into allow-edits
qwerty287 Feb 19, 2022
6c2e446
Merge branch 'main' into allow-edits
6543 Feb 20, 2022
f85ee71
Merge branch 'master' into allow-edits
6543 Feb 25, 2022
12f0efc
add right formations & text to migrations.go
6543 Feb 25, 2022
463618f
refactor
6543 Feb 25, 2022
ae410cd
Merge branch 'main' into allow-edits
qwerty287 Feb 26, 2022
884f09e
Merge branch 'main' into allow-edits
qwerty287 Mar 2, 2022
290f0c3
Merge branch 'allow-edits' of github.com:qwerty287/gitea into allow-e…
qwerty287 Mar 2, 2022
bfc946d
Merge branch 'main' into allow-edits
qwerty287 Mar 3, 2022
d4f4901
Merge branch 'main' into allow-edits
6543 Mar 6, 2022
723658a
Move base repo loading
qwerty287 Mar 11, 2022
024d44f
Fix checkbox visibility
qwerty287 Mar 11, 2022
e8e3527
Merge branch 'main' into allow-edits
qwerty287 Mar 11, 2022
cf2285a
Merge branch 'main' into allow-edits
qwerty287 Mar 23, 2022
4140480
Fix merge
qwerty287 Mar 23, 2022
4753b2f
Fix refactored parts
qwerty287 Mar 23, 2022
e62e988
Update models/migrations/migrations.go
qwerty287 Mar 24, 2022
d3f7b92
Merge branch 'main' into allow-edits
qwerty287 Mar 24, 2022
95e1eaa
Merge branch 'main' into allow-edits
qwerty287 Mar 27, 2022
228ead8
Merge branch 'main' into allow-edits
qwerty287 Apr 5, 2022
4deda60
Merge branch 'main' into allow-edits
6543 Apr 5, 2022
0feca99
Warn on SSH connection for incorrect configuration (#19317)
Apr 5, 2022
29904e7
Add `ENABLE_SSH_LOG` to debugging problems (#19316)
Apr 5, 2022
eb579d4
[skip ci] Updated translations via Crowdin
GiteaBot Apr 6, 2022
84f66d9
Package registry changes (#19305)
KN4CK3R Apr 6, 2022
b70b908
Show ssh command directly in template instead of i18n translation (#1…
junjieyuan Apr 6, 2022
1815192
[skip ci] Updated translations via Crowdin
GiteaBot Apr 7, 2022
2818531
Never use /api/v1 from Gitea UI Pages (#19318)
lunny Apr 7, 2022
c3d9871
[skip ci] Updated translations via Crowdin
GiteaBot Apr 8, 2022
ceb20d3
API: Search Issues, dont show 500 if filter result in empty list (#19…
6543 Apr 8, 2022
b01e16f
Remove dependent on session auth for api/v1 routers (#19321)
lunny Apr 8, 2022
ee153a3
Refactor CSRF protection modules, make sure CSRF tokens can be up-to-…
wxiaoguang Apr 8, 2022
53b8d49
Move milestone to models/issues/ (#19278)
lunny Apr 8, 2022
3cb3172
Use "main" as default branch name (#19354)
wxiaoguang Apr 9, 2022
52cccf7
Allow package linking to private repository (#19348)
KN4CK3R Apr 9, 2022
5d5cdff
[skip ci] Updated translations via Crowdin
GiteaBot Apr 10, 2022
fb9ec70
Fixed registry host value. (#19363)
KN4CK3R Apr 10, 2022
f8f3cb9
Add logic to switch between source/rendered on Markdown (#19356)
Apr 10, 2022
1c00aee
Fix panic in teams API when requesting members (#19360)
delvh Apr 11, 2022
66fff7c
Fix middleware function's placements for some `/user/...` (#19377)
Apr 12, 2022
e11d4d1
Document 409 error returned by repos/migrate api (#19376)
harryzcy Apr 12, 2022
c0c3a71
Note where frontend files are located in docs (#19379)
ktprograms Apr 12, 2022
013f563
[skip ci] Updated translations via Crowdin
GiteaBot Apr 13, 2022
5060442
Disallow selecting the text of buttons (#19330)
delvh Apr 14, 2022
68d2735
Use a struct as test options (#19393)
lunny Apr 14, 2022
a137027
Fix double blob-hunk (#19404)
Apr 15, 2022
093f3f2
Merge branch 'master' into allow-edits
6543 Apr 27, 2022
0dbf2c0
default is false
6543 Apr 27, 2022
3aa8116
Update models/pull.go
6543 Apr 27, 2022
5098223
Update models/pull.go
6543 Apr 27, 2022
3a8968f
use pull_services
6543 Apr 27, 2022
57bf535
Merge branch 'main' into allow-edits
qwerty287 Apr 28, 2022
87ebb3f
Consistent name
qwerty287 Apr 28, 2022
978764d
Fix hack
qwerty287 Apr 28, 2022
6a00395
Fix func
qwerty287 Apr 28, 2022
c7f17c9
fix form item name
wxiaoguang Apr 28, 2022
5079662
Merge branch 'main' into allow-edits
wxiaoguang Apr 28, 2022
ed139f0
fix merge conflicts
wxiaoguang Apr 28, 2022
7b64f0f
Remove name
qwerty287 Apr 28, 2022
4c2eb4d
Fix name
qwerty287 Apr 28, 2022
d0880cb
Merge branch 'main' into allow-edits
6543 Apr 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,8 @@ var migrations = []Migration{
// v203 -> v204
NewMigration("Add Sorting to ProjectIssue table", addProjectIssueSorting),
// v204 -> v205
NewMigration("Add key is verified to ssh key", addSSHKeyIsVerified),
// v205 -> v206
NewMigration("Add allow edits from maintainers to PullRequest table", addAllowEditsFromMaintainers),
}

Expand Down
13 changes: 5 additions & 8 deletions models/migrations/v204.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@

package migrations

import (
"xorm.io/xorm"
)
import "xorm.io/xorm"

func addAllowEditsFromMaintainers(x *xorm.Engine) error {
// PullRequest represents relation between pull request and repositories.
type PullRequest struct {
AllowEditsFromMaintainers bool
func addSSHKeyIsVerified(x *xorm.Engine) error {
type PublicKey struct {
Verified bool `xorm:"NOT NULL DEFAULT false"`
}

return x.Sync2(new(PullRequest))
return x.Sync(new(PublicKey))
}
18 changes: 18 additions & 0 deletions models/migrations/v205.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2021 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package migrations

import (
"xorm.io/xorm"
)

func addAllowEditsFromMaintainers(x *xorm.Engine) error {
// PullRequest represents relation between pull request and repositories.
type PullRequest struct {
AllowEditsFromMaintainers bool
}

return x.Sync2(new(PullRequest))
}
You are viewing a condensed version of this merge commit. You can view the full changes here.