Skip to content

Commit 163e2ed

Browse files
ashimokawaashimokawa
committed
Merge remote-tracking branch 'upstream/release/v1.16' into codeberg-1.16
2 parents 99e133b + 00da1fa commit 163e2ed

File tree

6 files changed

+12
-135
lines changed

6 files changed

+12
-135
lines changed

‎go.mod‎

Lines changed: 1 addition & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module code.gitea.io/gitea
33
go 1.16
44

55
require (
6-
cloud.google.com/go v0.99.0 // indirect
76
code.gitea.io/gitea-vet v0.2.1
87
code.gitea.io/sdk/gitea v0.15.1
98
gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb
@@ -55,7 +54,6 @@ require (
5554
github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
5655
github.com/klauspost/compress v1.13.6
5756
github.com/klauspost/cpuid/v2 v2.0.9
58-
github.com/klauspost/pgzip v1.2.5 // indirect
5957
github.com/lib/pq v1.10.2
6058
github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
6159
github.com/markbates/goth v1.69.0
@@ -93,7 +91,7 @@ require (
9391
go.uber.org/atomic v1.9.0 // indirect
9492
go.uber.org/multierr v1.8.0 // indirect
9593
go.uber.org/zap v1.21.0 // indirect
96-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
94+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
9795
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
9896
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
9997
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
@@ -112,174 +110,49 @@ require (
112110
github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
113111
github.com/Microsoft/go-winio v0.5.2 // indirect
114112
github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
115-
github.com/PuerkitoBio/purell v1.1.1 // indirect
116-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
117-
github.com/RoaringBitmap/roaring v0.9.4 // indirect
118-
github.com/acomagu/bufpipe v1.0.3 // indirect
119113
github.com/andybalholm/brotli v1.0.4 // indirect
120-
github.com/andybalholm/cascadia v1.3.1 // indirect
121-
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
122-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
123-
github.com/aymerick/douceur v0.2.0 // indirect
124-
github.com/beorn7/perks v1.0.1 // indirect
125-
github.com/bgentry/speakeasy v0.1.0 // indirect
126114
github.com/bits-and-blooms/bitset v1.2.1 // indirect
127-
github.com/blevesearch/bleve_index_api v1.0.1 // indirect
128-
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
129-
github.com/blevesearch/mmap-go v1.0.3 // indirect
130-
github.com/blevesearch/scorch_segment_api/v2 v2.1.0 // indirect
131-
github.com/blevesearch/segment v0.9.0 // indirect
132-
github.com/blevesearch/snowballstem v0.9.0 // indirect
133-
github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect
134-
github.com/blevesearch/vellum v1.0.7 // indirect
135-
github.com/blevesearch/zapx/v11 v11.3.3 // indirect
136-
github.com/blevesearch/zapx/v12 v12.3.3 // indirect
137-
github.com/blevesearch/zapx/v13 v13.3.3 // indirect
138-
github.com/blevesearch/zapx/v14 v14.3.3 // indirect
139-
github.com/blevesearch/zapx/v15 v15.3.3 // indirect
140115
github.com/boombuler/barcode v1.0.1 // indirect
141116
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
142-
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
143-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
144117
github.com/cloudflare/cfssl v1.6.1 // indirect
145-
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
146-
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
147-
github.com/coreos/go-semver v0.3.0 // indirect
148-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
149118
github.com/couchbase/go-couchbase v0.0.0-20210224140812-5740cd35f448 // indirect
150119
github.com/couchbase/gomemcached v0.1.2 // indirect
151120
github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401 // indirect
152-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
153-
github.com/davecgh/go-spew v1.1.1 // indirect
154-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
155-
github.com/dlclark/regexp2 v1.4.0 // indirect
156-
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
157-
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
158-
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
159121
github.com/felixge/httpsnoop v1.0.2 // indirect
160-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
161-
github.com/fsnotify/fsnotify v1.5.1 // indirect
162-
github.com/fullstorydev/grpcurl v1.8.1 // indirect
163122
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
164123
github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
165-
github.com/go-enry/go-oniguruma v1.2.1 // indirect
166-
github.com/go-git/gcfg v1.5.0 // indirect
167124
github.com/go-openapi/analysis v0.21.2 // indirect
168125
github.com/go-openapi/errors v0.20.2 // indirect
169-
github.com/go-openapi/inflect v0.19.0 // indirect
170-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
171-
github.com/go-openapi/jsonreference v0.19.6 // indirect
172-
github.com/go-openapi/loads v0.21.0 // indirect
173126
github.com/go-openapi/runtime v0.21.1 // indirect
174-
github.com/go-openapi/spec v0.20.4 // indirect
175127
github.com/go-openapi/strfmt v0.21.1 // indirect
176-
github.com/go-openapi/swag v0.19.15 // indirect
177-
github.com/go-openapi/validate v0.20.3 // indirect
178128
github.com/go-stack/stack v1.8.1 // indirect
179-
github.com/goccy/go-json v0.9.5 // indirect
180-
github.com/gogo/protobuf v1.3.2 // indirect
181129
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
182-
github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect
183-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
184-
github.com/golang/mock v1.6.0 // indirect
185-
github.com/golang/protobuf v1.5.2 // indirect
186130
github.com/golang/snappy v0.0.4 // indirect
187-
github.com/google/btree v1.0.1 // indirect
188-
github.com/google/certificate-transparency-go v1.1.2-0.20210511102531-373a877eec92 // indirect
189-
github.com/google/go-querystring v1.1.0 // indirect
190-
github.com/gorilla/css v1.0.0 // indirect
191-
github.com/gorilla/handlers v1.5.1 // indirect
192131
github.com/gorilla/mux v1.8.0 // indirect
193-
github.com/gorilla/securecookie v1.1.1 // indirect
194-
github.com/gorilla/websocket v1.4.2 // indirect
195-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
196-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
197-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
198-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
199132
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
200-
github.com/hashicorp/hcl v1.0.0 // indirect
201-
github.com/imdario/mergo v0.3.12 // indirect
202-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
203-
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
204-
github.com/jessevdk/go-flags v1.5.0 // indirect
205-
github.com/jhump/protoreflect v1.8.2 // indirect
206-
github.com/jonboulle/clockwork v0.2.2 // indirect
207-
github.com/josharian/intern v1.0.0 // indirect
208133
github.com/kevinburke/ssh_config v1.1.0 // indirect
209134
github.com/kr/pretty v0.3.0 // indirect
210-
github.com/kr/text v0.2.0 // indirect
211-
github.com/libdns/libdns v0.2.1 // indirect
212-
github.com/magiconair/properties v1.8.5 // indirect
213-
github.com/mailru/easyjson v0.7.7 // indirect
214-
github.com/markbates/going v1.0.0 // indirect
215135
github.com/mattn/go-runewidth v0.0.13 // indirect
216-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
217136
github.com/mholt/acmez v1.0.2 // indirect
218137
github.com/miekg/dns v1.1.46 // indirect
219138
github.com/minio/md5-simd v1.1.2 // indirect
220139
github.com/minio/sha256-simd v1.0.0 // indirect
221-
github.com/mitchellh/go-homedir v1.1.0 // indirect
222-
github.com/mitchellh/mapstructure v1.4.3 // indirect
223-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
224-
github.com/modern-go/reflect2 v1.0.2 // indirect
225140
github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
226-
github.com/mschoch/smat v0.2.0 // indirect
227141
github.com/nwaples/rardecode v1.1.3 // indirect
228-
github.com/oklog/ulid v1.3.1 // indirect
229-
github.com/olekukonko/tablewriter v0.0.5 // indirect
230-
github.com/pelletier/go-toml v1.9.4 // indirect
231142
github.com/pierrec/lz4/v4 v4.1.14 // indirect
232-
github.com/pmezard/go-difflib v1.0.0 // indirect
233-
github.com/prometheus/client_model v0.2.0 // indirect
234-
github.com/prometheus/common v0.32.1 // indirect
235-
github.com/prometheus/procfs v0.7.3 // indirect
236-
github.com/rivo/uniseg v0.2.0 // indirect
237143
github.com/rogpeppe/go-internal v1.8.1 // indirect
238144
github.com/rs/xid v1.3.0 // indirect
239-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
240145
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
241-
github.com/sirupsen/logrus v1.8.1 // indirect
242-
github.com/soheilhy/cmux v0.1.5 // indirect
243146
github.com/spf13/afero v1.8.0 // indirect
244-
github.com/spf13/cast v1.4.1 // indirect
245147
github.com/spf13/cobra v1.3.0 // indirect
246-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
247-
github.com/spf13/pflag v1.0.5 // indirect
248148
github.com/spf13/viper v1.10.1 // indirect
249149
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
250-
github.com/steveyen/gtreap v0.1.0 // indirect
251-
github.com/subosito/gotenv v1.2.0 // indirect
252-
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
253-
github.com/toqueteos/webbrowser v1.2.0 // indirect
254150
github.com/ulikunitz/xz v0.5.10 // indirect
255-
github.com/x448/float16 v0.8.4 // indirect
256151
github.com/xanzy/ssh-agent v0.3.1 // indirect
257-
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
258-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
259152
go.etcd.io/bbolt v1.3.6 // indirect
260-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
261-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
262-
go.etcd.io/etcd/client/v2 v2.305.1 // indirect
263-
go.etcd.io/etcd/client/v3 v3.5.0-alpha.0 // indirect
264-
go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0 // indirect
265-
go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 // indirect
266-
go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 // indirect
267-
go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 // indirect
268-
go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0 // indirect
269-
go.etcd.io/etcd/v3 v3.5.0-alpha.0 // indirect
270153
go.mongodb.org/mongo-driver v1.8.2 // indirect
271-
golang.org/x/mod v0.5.1 // indirect
272154
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
273-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
274-
google.golang.org/appengine v1.6.7 // indirect
275-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
276-
google.golang.org/grpc v1.43.0 // indirect
277-
google.golang.org/protobuf v1.27.1 // indirect
278155
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
279-
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
280-
gopkg.in/warnings.v0 v0.1.2 // indirect
281-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
282-
sigs.k8s.io/yaml v1.2.0 // indirect
283156
)
284157

285158
replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,8 +1676,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
16761676
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
16771677
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
16781678
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1679-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
1680-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1679+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
1680+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
16811681
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
16821682
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
16831683
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

‎options/locale/locale_ru-RU.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ pulls.manually_merged=Слито вручную
14351435
pulls.manually_merged_as=Запрос на слияние был объединён вручную, как <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
14361436
pulls.is_closed=Запрос на слияние был закрыт.
14371437
pulls.has_merged=Слияние этого запроса успешно завершено.
1438-
pulls.title_wip_desc=`<a href="#">Добавьте <strong>%s</strong> в начало заголовка</a> для защиты от случайного досрочного принятия запроса на слияние
1438+
pulls.title_wip_desc=`<a href="#">Добавьте <strong>%s</strong> в начало заголовка</a> для защиты от случайного досрочного принятия запроса на слияние`
14391439
pulls.cannot_merge_work_in_progress=Этот запрос на слияние помечен как в процессе работы.
14401440
pulls.still_in_progress=Всё ещё в процессе?
14411441
pulls.add_prefix=Добавить <strong>%s</strong> префикс

‎routers/web/web.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,16 +374,16 @@ func RegisterRoutes(m *web.Route) {
374374

375375
m.Group("/user", func() {
376376
// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
377-
m.Get("/activate", auth.Activate, reqSignIn)
378-
m.Post("/activate", auth.ActivatePost, reqSignIn)
377+
m.Get("/activate", auth.Activate)
378+
m.Post("/activate", auth.ActivatePost)
379379
m.Any("/activate_email", auth.ActivateEmail)
380380
m.Get("/avatar/{username}/{size}", user.AvatarByUserName)
381381
m.Get("/recover_account", auth.ResetPasswd)
382382
m.Post("/recover_account", auth.ResetPasswdPost)
383383
m.Get("/forgot_password", auth.ForgotPasswd)
384384
m.Post("/forgot_password", auth.ForgotPasswdPost)
385385
m.Post("/logout", auth.SignOut)
386-
m.Get("/task/{task}", user.TaskStatus)
386+
m.Get("/task/{task}", reqSignIn, user.TaskStatus)
387387
})
388388
// ***** END: User *****
389389

‎services/pull/check.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ var (
3636
ErrUserNotAllowedToMerge = errors.New("user not allowed to merge")
3737
ErrHasMerged = errors.New("has already been merged")
3838
ErrIsWorkInProgress = errors.New("work in progress PRs cannot be merged")
39+
ErrIsChecking = errors.New("cannot merge while conflict checking is in progress")
3940
ErrNotMergableState = errors.New("not in mergeable state")
4041
ErrDependenciesLeft = errors.New("is blocked by an open dependency")
4142
)
@@ -88,6 +89,10 @@ func CheckPullMergable(ctx context.Context, doer *user_model.User, perm *models.
8889
return ErrNotMergableState
8990
}
9091

92+
if pr.IsChecking() {
93+
return ErrIsChecking
94+
}
95+
9196
if err := CheckPRReadyToMerge(pr, false); err != nil {
9297
if models.IsErrNotAllowedToMerge(err) {
9398
if force {

‎templates/repo/diff/section_unified.tmpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<td class="chroma lines-code blob-hunk">{{/*
3333
*/}}<code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{$.root.i18n.Tr "repo.line_unicode"}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code>{{/*
3434
*/}}
35-
{{$line.Content}}
3635
</td>
3736
{{else}}
3837
<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">{{/*

0 commit comments

Comments
 (0)