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
..
admin	Delete a user's public key via admin api (closes #3014) (#3059)	2017-12-06 12:27:10 +02:00
convert	Improvements for supporting UI Location (#3146)	2017-12-14 07:45:31 +08:00
misc	Update swagger documentation (#2899)	2017-11-13 09:02:25 +02:00
org	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
repo	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
swagger	Update swagger documentation (#2899)	2017-11-13 09:02:25 +02:00
user	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
utils	Fix API status code for hook creation (#2814)	2017-11-20 15:00:53 +08:00
api.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00