155 commits

Author	SHA1	Message	Date
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
Ethan Koenig	f26f4a7e01	Update swagger documentation (#2899) ... * Update swagger documentation Add docs for missing endpoints Add documentation for request parameters Make parameter naming consistent Fix response documentation * Restore delete comments	2017-11-13 09:02:25 +02:00
Ethan Koenig	d91fe5254d	Fix ignored errors in API route (#2850) ... * Fix ignored errors in API route	2017-11-04 19:10:01 +01:00
Lunny Xiao	081485ecfd	add milestone changed traker on issue view (#804)	2017-02-01 10:36:08 +08:00
Kim "BKC" Carlbäcker	0f05470cb8	[API] Pull Requests (#248)	2016-12-02 12:10:39 +01:00