1
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
gitea/routers/api/v1/repo
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
..
branch.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
collaborators.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
file.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
fork.go Fix ignored errors when checking if organization, team member (#3177) 2017-12-21 09:43:26 +02:00
hook.go Fix API status code for hook creation (#2814) 2017-11-20 15:00:53 +08:00
issue_comment.go Fix comment API paths (#2813) 2017-11-20 15:24:07 +08:00
issue_label.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
issue_tracked_time.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
issue.go Fix swagger docs (#3300) 2018-01-04 14:31:40 +08:00
key.go Disable add key button if SSH is disabled (#2873) 2017-11-21 11:49:33 +08:00
label.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
milestone.go Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
pull.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
release.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
repo.go Fix ignored errors when checking if organization, team member (#3177) 2017-12-21 09:43:26 +02:00
star.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
status.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00
subscriber.go Update swagger documentation (#2899) 2017-11-13 09:02:25 +02:00