summaryrefslogtreecommitdiffstats
path: root/integrations/pull_merge_test.go
Commit message (Expand)AuthorAgeFilesLines
* 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