aboutsummaryrefslogtreecommitdiffstats
path: root/integrations/pull_merge_test.go
Commit message (Expand)AuthorAgeFilesLines
* Refactor AssertExistsAndLoadBean to use generics (#20797)Lunny Xiao2022-08-161-8/+8
* Make better use of i18n (#20096)Gusted2022-06-261-2/+2
* Move issues related files into models/issues (#19931)Lunny Xiao2022-06-131-10/+11
* Move almost all functions' parameter db.Engine to context.Context (#19748)Lunny Xiao2022-05-201-1/+2
* Use Vue to refactor pull merge UI (#19650)wxiaoguang2022-05-121-4/+2
* Allow custom default merge message with .gitea/default_merge_message/<merge_s...Lunny Xiao2022-05-081-3/+4
* Use for a repo action one database transaction (#19576)65432022-05-031-3/+3
* Set correct PR status on 3way on conflict checking (#19457)Gusted2022-04-211-0/+73
* Remove legacy unmaintained packages, refactor to support change default local...wxiaoguang2022-04-031-1/+1
* Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)wxiaoguang2022-04-011-15/+13
* Make git.OpenRepository accept Context (#19260)65432022-03-301-2/+2
* Update HTTP status codes to modern codes (#18063)KN4CK3R2022-03-231-3/+3
* Change git.cmd to RunWithContext (#18693)Martin Scholz2022-02-111-2/+15
* Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)65432022-02-061-6/+6
* format with gofumpt (#18184)65432022-01-201-4/+4
* Propagate context and ensure git commands run in request context (#17868)zeripath2022-01-191-3/+3
* Abort merge if head has been updated before pressing merge (#18032)zeripath2021-12-201-3/+3
* Move repository model into models/repo (#17933)Lunny Xiao2021-12-101-15/+16
* Move user related model into models/user (#17781)Lunny Xiao2021-11-241-4/+5
* Decouple unit test, remove intermediate `unittestbridge` package (#17662)wxiaoguang2021-11-161-7/+7
* Move webhook into models/webhook/ (#17579)Lunny Xiao2021-11-101-8/+9
* Move db related basic functions to models/db (#17075)Lunny Xiao2021-09-191-6/+7
* Add links to toggle WIP status (#14677)Jimmy Praet2021-05-271-4/+2
* Some code improvements (#14266)Lunny Xiao2021-01-061-0/+2
* CSS color variables, less bold font weight and more (#13567)silverwind2020-11-151-1/+1
* Fix styling for PR merge section when no checks (#11609)Cirno the Strongest2020-05-251-1/+1
* Prettify Timeline (#10972)Sorien2020-04-111-1/+1
* Only check for conflicts/merging if the PR has not been merged in the interim...zeripath2020-02-101-9/+1
* Fix "data race" in testlogger (#9159)zeripath2019-11-261-6/+6
* Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)zeripath2019-11-101-0/+137
* Use gitea forked macaron (#7933)Tamal Saha2019-08-231-1/+1
* Fix duplicate call of webhook (#7821)Antoine GIRARD2019-08-111-0/+34
* fix pull view ui merge section (#7335)Lunny Xiao2019-07-011-1/+1
* Add commit statuses reports on pull request view (#6845)Lunny Xiao2019-06-301-1/+1
* Remove local clones & make hooks run on merge/edit/upload (#6672)zeripath2019-05-111-75/+86
* Add rebase with merge commit merge style (#3844) (#4052)Julian2018-12-271-0/+13
* Disable merging a WIP Pull request (#4529)Julien Tant2018-08-131-0/+21
* Improve English grammar and consistency. (#3614)bugreport02018-04-191-1/+1
* Fix escaping changed title in comments (#3530)Lauris BH2018-02-181-4/+4
* Add Pull Request merge options - Ignore white-space for conflict checking, Re...Lauris BH2018-01-051-4/+33
* Unit tests for routers/repo/issue_label (#3198)Ethan Koenig2017-12-151-2/+4
* Use httptest in integration tests (#3080)Ethan Koenig2017-12-041-2/+3
* Integration test for activity page (#2704)Lauris BH2017-10-161-2/+2
* Fix so that user can still fork his own repository to owned organizations (#2...Lauris BH2017-10-151-2/+2
* Less verbose integration tests (#2123)Ethan Koenig2017-07-071-18/+9
* Improve integration test helper functions (#2049)Ethan Koenig2017-06-251-2/+0
* Make branch deletion URL more like GitHub's, fixes #1397 (#1994)Lauris BH2017-06-211-0/+56
* fix golint error and rename func for suggestion. (#1997)Bo-Yi Wu2017-06-171-1/+1
* Consolidate boilerplate in integration tests (#1979)Ethan Koenig2017-06-171-10/+5
* Add integration test for pull-request merge (#1912)Mura Li2017-06-151-0/+53