Commit graph

1346 commits

Author SHA1 Message Date
GiteaBot fc40cdfa89 [skip ci] Updated translations via Crowdin 2020-11-02 15:59:27 +00:00
GiteaBot 8176ba6573 [skip ci] Updated translations via Crowdin 2020-11-01 20:05:29 +00:00
GiteaBot e7750e0f6a [skip ci] Updated translations via Crowdin 2020-10-31 17:25:33 +00:00
GiteaBot d01d39d6cf [skip ci] Updated translations via Crowdin 2020-10-31 12:18:38 +00:00
GiteaBot e16a5bb634 [skip ci] Updated translations via Crowdin 2020-10-30 22:00:02 +00:00
GiteaBot 764237e78c [skip ci] Updated translations via Crowdin 2020-10-30 16:28:07 +00:00
GiteaBot 643a0a691a [skip ci] Updated translations via Crowdin 2020-10-29 21:42:52 +00:00
GiteaBot bb89fa1aaa [skip ci] Updated translations via Crowdin 2020-10-27 20:07:43 +00:00
GiteaBot afe9d79104 [skip ci] Updated translations via Crowdin 2020-10-26 16:43:30 +00:00
GiteaBot dbebc6b0e3 [skip ci] Updated translations via Crowdin 2020-10-26 09:06:29 +00:00
Pedro Alves c40df54e28
Group Label Changed Comments in timeline (#13304)
* Create function to group label comments

* Combine multiple label additions into one

* Group removed and added labels in the same comment

* Fix indentation on comments.tmpl

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: zeripath <art27@cantab.net>
2020-10-25 17:49:48 -04:00
GiteaBot 756c090dbe [skip ci] Updated translations via Crowdin 2020-10-25 20:57:54 +00:00
Divyam Bhasin 7974b34183
#12897 - add mastodon provider (#13293)
* added mastodon provider to oauth code

* changed go.mod and vendor/modules.txt to add updated goth

* vendored mastodon and new goth

* committing result of go mod tidy && go mod vendor

* added pic and mastodon to oauth models

* handled instance url

* applied lafriks suggestion

* Update web_src/js/index.js

Co-authored-by: techknowlogick <matti@mdranta.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <matti@mdranta.net>
2020-10-25 14:21:49 -04:00
GiteaBot f565cf5dcf [skip ci] Updated translations via Crowdin 2020-10-25 17:20:28 +00:00
GiteaBot 65dc4d0410 [skip ci] Updated translations via Crowdin 2020-10-24 17:50:51 +00:00
GiteaBot eef5871042 [skip ci] Updated translations via Crowdin 2020-10-24 16:49:12 +00:00
GiteaBot 2fa4c4ad3a [skip ci] Updated translations via Crowdin 2020-10-24 11:55:43 +00:00
zeripath 0800c7e91d
Rearrange the order of the merged by etc. in locale (#13284)
Fix #13260

Signed-off-by: Andrew Thornton <art27@cantab.net>
2020-10-23 23:34:21 -04:00
GiteaBot e4d9533543 [skip ci] Updated translations via Crowdin 2020-10-23 16:00:48 +00:00
GiteaBot bfc553164a [skip ci] Updated translations via Crowdin 2020-10-23 10:12:50 +00:00
GiteaBot 9912a11b33 [skip ci] Updated translations via Crowdin 2020-10-22 19:49:54 +00:00
GiteaBot 1989fe2ddc [skip ci] Updated translations via Crowdin 2020-10-22 18:03:41 +00:00
GiteaBot e9869f59af [skip ci] Updated translations via Crowdin 2020-10-22 17:05:26 +00:00
GiteaBot 178861952e [skip ci] Updated translations via Crowdin 2020-10-22 15:46:58 +00:00
GiteaBot e964c6ec18 [skip ci] Updated translations via Crowdin 2020-10-22 05:47:21 +00:00
GiteaBot a06ea38207 [skip ci] Updated translations via Crowdin 2020-10-21 20:00:31 +00:00
GiteaBot f0fe5683fe [skip ci] Updated translations via Crowdin 2020-10-21 15:43:44 +00:00
GiteaBot 53359b1861 [skip ci] Updated translations via Crowdin 2020-10-21 11:03:31 +00:00
zeripath 965861043a
Return the full rejection message and errors in flash errors (#13221)
Signed-off-by: Andrew Thornton <art27@cantab.net>
2020-10-20 19:50:10 -04:00
GiteaBot 70cb9e38e2 [skip ci] Updated translations via Crowdin 2020-10-20 18:19:29 +00:00
GiteaBot b50448b286 [skip ci] Updated translations via Crowdin 2020-10-20 12:54:03 +00:00
GiteaBot d67172b136 [skip ci] Updated translations via Crowdin 2020-10-19 19:26:52 +00:00
GiteaBot 40779938a9 [skip ci] Updated translations via Crowdin 2020-10-18 17:52:36 +00:00
GiteaBot 27687fa4f0 [skip ci] Updated translations via Crowdin 2020-10-18 14:11:20 +00:00
GiteaBot 131278ff22 [skip ci] Updated translations via Crowdin 2020-10-16 17:14:34 +00:00
GiteaBot bcf45bb162 [skip ci] Updated translations via Crowdin 2020-10-15 18:31:29 +00:00
GiteaBot 25f7e1c50b [skip ci] Updated translations via Crowdin 2020-10-15 09:49:02 +00:00
GiteaBot deb0333c96 [skip ci] Updated translations via Crowdin 2020-10-15 08:18:52 +00:00
Iván Valdés 05c7e58742
Show outdated comments in pull request (#13148)
Co-authored-by: zeripath <art27@cantab.net>
2020-10-15 11:17:48 +03:00
GiteaBot bfb3333528 [skip ci] Updated translations via Crowdin 2020-10-15 04:15:26 +00:00
GiteaBot e4a3785218 [skip ci] Updated translations via Crowdin 2020-10-14 21:45:21 +00:00
GiteaBot 07c9f6dca4 [skip ci] Updated translations via Crowdin 2020-10-14 18:49:08 +00:00
GiteaBot 8fa74045c4 [skip ci] Updated translations via Crowdin 2020-10-14 17:02:15 +00:00
GiteaBot 36e41d4764 [skip ci] Updated translations via Crowdin 2020-10-14 13:09:05 +00:00
GiteaBot 93f7525061 [skip ci] Updated translations via Crowdin 2020-10-14 12:12:40 +00:00
GiteaBot e70df67d47 [skip ci] Updated translations via Crowdin 2020-10-14 11:18:41 +00:00
Lauris BH a2a05d164b
Fix punctuation in trust model description (#13140) 2020-10-14 14:17:40 +03:00
GiteaBot aa73b7b7e5 [skip ci] Updated translations via Crowdin 2020-10-14 04:07:05 +00:00
6543 49b1948cb1
Gitea 2 Gitea migration (#12657)
* first draft

* update gitea sdk to 9e280adb4da

* adapt feat of updated sdk

* releases now works

* break the Reactions loop

* use convertGiteaLabel

* fix endless loop because paggination is not supported there !!!

* rename gitea local uploader files

* pagination can bite you in the ass

* Version Checks

* lint

* docs

* rename gitea sdk import to miss future conficts

* go-swagger: dont scan the sdk structs

* make sure gitea can shutdown gracefully

* make GetPullRequests and GetIssues similar

* rm useles

* Add Test: started ...

* ... add tests ...

* Add tests and Fixing things

* Workaround missing SHA

* Adapt: Ensure that all migration requests are cancellable
(714ab71ddc)

* LINT: fix misspells in test set

* adapt ListMergeRequestAwardEmoji

* update sdk

* Return error when creating giteadownloader failed

* update sdk

* adapt new sdk

* adopt new features

* check version before err

* adapt: 'migrate service type switch page'

* optimize

* Fix DefaultBranch

* impruve

* handle subPath

* fix test

* Fix ReviewCommentPosition

* test GetReviews

* add DefaultBranch int test set

* rm unused

* Update SDK to v0.13.0

* addopt sdk changes

* found better link

* format template

* Update Docs

* Update Gitea SDK (v0.13.1)
2020-10-14 07:06:00 +03:00
赵智超 dfa7291f8f
[Enhancement] Allow admin to merge pr with protected file changes (#12078)
* [Enhancement] Allow admin to merge pr with protected file changes

As tilte, show protected message in diff page and merge box.

Signed-off-by: a1012112796 <1012112796@qq.com>

* remove unused ver

* Update options/locale/locale_en-US.ini

Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>

* Add TrN

* Apply suggestions from code review

* fix lint

* Update options/locale/locale_en-US.ini

Co-authored-by: zeripath <art27@cantab.net>

* Apply suggestions from code review

* move pr proteced files check to TestPatch
* Call TestPatch when protected branches settings changed

* Apply review suggestion @CirnoT

* move to service @lunny

* slightly restructure routers/private/hook.go

Adds a lot of comments and simplifies the logic

Signed-off-by: Andrew Thornton <art27@cantab.net>

* placate lint

Signed-off-by: Andrew Thornton <art27@cantab.net>

* skip duplicate protected files check

* fix check logic

* slight refactor of TestPatch

Signed-off-by: Andrew Thornton <art27@cantab.net>

* When checking for protected files changes in TestPatch use the temporary repository

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix introduced issue with hook

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Remove the check on PR index being greater than 0 as it unnecessary

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2020-10-13 14:50:57 -04:00