You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
7 years ago
..
branch.go Update swagger documentation (#2899) 7 years ago
collaborators.go Update swagger documentation (#2899) 7 years ago
file.go Update swagger documentation (#2899) 7 years ago
fork.go Fix ignored errors when checking if organization, team member (#3177) 7 years ago
hook.go Fix API status code for hook creation (#2814) 7 years ago
issue.go Fix swagger docs (#3300) 7 years ago
issue_comment.go Fix comment API paths (#2813) 7 years ago
issue_label.go Update swagger documentation (#2899) 7 years ago
issue_tracked_time.go Update swagger documentation (#2899) 7 years ago
key.go Disable add key button if SSH is disabled (#2873) 7 years ago
label.go Update swagger documentation (#2899) 7 years ago
milestone.go Refactor struct's time to remove unnecessary memory usage (#3142) 7 years ago
pull.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 7 years ago
release.go Update swagger documentation (#2899) 7 years ago
repo.go Fix ignored errors when checking if organization, team member (#3177) 7 years ago
star.go Update swagger documentation (#2899) 7 years ago
status.go Update swagger documentation (#2899) 7 years ago
subscriber.go Update swagger documentation (#2899) 7 years ago