1
0
Fork 0
forgejo/services/pull
j.yao.SUSE b40107c416
[suggest] change merge strategy: do not check write access if user in merge white list (#10951)
* [suggest] change merge strategy: do not check write access if user in merge white list #10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

* fix NPE

* Fix cross compile (#10952)

* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

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

* fix merge box icon color bug (#10974)

that because need some space beturn ``text`` and color defines

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

* [skip ci] Updated translations via Crowdin

* Allow X in addition to x in tasks (#10979)

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

* remove api: merge  reqRepoWriter

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 赵智超 <1012112796@qq.com>
Co-authored-by: GiteaBot <teabot@gitea.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
2020-04-08 14:26:50 +03:00
..
check.go Only update merge_base in checker if not already merged (#10908) 2020-04-01 15:02:11 +03:00
check_test.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 2020-02-10 01:09:31 +02:00
commit_status.go Fix bug on pull view when required status check no ci result (#10648) 2020-03-07 07:33:20 +00:00
lfs.go Add basic repository lfs management (#7199) 2019-10-28 18:31:55 +00:00
main_test.go Move some pull request functions from models to services (#9266) 2019-12-06 21:44:10 -05:00
merge.go [suggest] change merge strategy: do not check write access if user in merge white list (#10951) 2020-04-08 14:26:50 +03:00
patch.go Generate Diff and Patch direct from Pull head (#10936) 2020-04-03 21:21:41 +08:00
pull.go Only update merge_base in checker if not already merged (#10908) 2020-04-01 15:02:11 +03:00
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 2019-12-15 04:28:51 +01:00
review.go Display pull request head branch even the branch deleted or repository deleted (#10413) 2020-03-02 22:31:55 +00:00
temp_repo.go Prevent deadlock in pull_service.GetDiverging(pr) (#10905) 2020-04-01 20:03:08 +01:00
update.go Prevent deadlock in pull_service.GetDiverging(pr) (#10905) 2020-04-01 20:03:08 +01:00