0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-25 08:54:17 -05:00
forgejo/public
Lauris BH 8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)
* Pull request options migration and UI in settings

* Add ignore whitespace functionality

* Fix settings if pull requests are disabled

* Fix migration transaction

* Merge with Rebase functionality

* UI changes and related functionality for pull request merging button

* Implement squash functionality

* Fix rebase merging

* Fix pull request merge tests

* Add squash and rebase tests

* Fix API method to reuse default message functions

* Some refactoring and small fixes

* Remove more hardcoded values from tests

* Remove unneeded check from API method

* Fix variable name and comment typo

* Fix reset commit count after PR merge
2018-01-05 20:56:50 +02:00
..
css Added progressbar for issues (#1146). (#3171) 2018-01-03 02:34:13 -06:00
img Add dingtalk webhook (#2777) 2017-11-21 06:26:43 +02:00
js Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
less Added progressbar for issues (#1146). (#3171) 2018-01-03 02:34:13 -06:00
vendor Mention completion for issue editor. (#3136) 2017-12-11 14:03:04 +08:00
swagger.v1.json Fix swagger docs (#3300) 2018-01-04 14:31:40 +08:00