| Commit message (Expand) | Author | Age | Files | Lines |
* | Only check for conflicts/merging if the PR has not been merged in the interim... | zeripath | 2020-02-10 | 1 | -9/+1 |
* | Fix "data race" in testlogger (#9159) | zeripath | 2019-11-26 | 1 | -6/+6 |
* | Adjust error reporting from merge failures and use LC_ALL=C for git (#8548) | zeripath | 2019-11-10 | 1 | -0/+137 |
* | Use gitea forked macaron (#7933) | Tamal Saha | 2019-08-23 | 1 | -1/+1 |
* | Fix duplicate call of webhook (#7821) | Antoine GIRARD | 2019-08-11 | 1 | -0/+34 |
* | fix pull view ui merge section (#7335) | Lunny Xiao | 2019-07-01 | 1 | -1/+1 |
* | Add commit statuses reports on pull request view (#6845) | Lunny Xiao | 2019-06-30 | 1 | -1/+1 |
* | Remove local clones & make hooks run on merge/edit/upload (#6672) | zeripath | 2019-05-11 | 1 | -75/+86 |
* | Add rebase with merge commit merge style (#3844) (#4052) | Julian | 2018-12-27 | 1 | -0/+13 |
* | Disable merging a WIP Pull request (#4529) | Julien Tant | 2018-08-13 | 1 | -0/+21 |
* | Improve English grammar and consistency. (#3614) | bugreport0 | 2018-04-19 | 1 | -1/+1 |
* | Fix escaping changed title in comments (#3530) | Lauris BH | 2018-02-18 | 1 | -4/+4 |
* | Add Pull Request merge options - Ignore white-space for conflict checking, Re... | Lauris BH | 2018-01-05 | 1 | -4/+33 |
* | Unit tests for routers/repo/issue_label (#3198) | Ethan Koenig | 2017-12-15 | 1 | -2/+4 |
* | Use httptest in integration tests (#3080) | Ethan Koenig | 2017-12-04 | 1 | -2/+3 |
* | Integration test for activity page (#2704) | Lauris BH | 2017-10-16 | 1 | -2/+2 |
* | Fix so that user can still fork his own repository to owned organizations (#2... | Lauris BH | 2017-10-15 | 1 | -2/+2 |
* | Less verbose integration tests (#2123) | Ethan Koenig | 2017-07-07 | 1 | -18/+9 |
* | Improve integration test helper functions (#2049) | Ethan Koenig | 2017-06-25 | 1 | -2/+0 |
* | Make branch deletion URL more like GitHub's, fixes #1397 (#1994) | Lauris BH | 2017-06-21 | 1 | -0/+56 |
* | fix golint error and rename func for suggestion. (#1997) | Bo-Yi Wu | 2017-06-17 | 1 | -1/+1 |
* | Consolidate boilerplate in integration tests (#1979) | Ethan Koenig | 2017-06-17 | 1 | -10/+5 |
* | Add integration test for pull-request merge (#1912) | Mura Li | 2017-06-15 | 1 | -0/+53 |