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
..
admin	Delete a user's public key via admin api (closes #3014) (#3059)	7 years ago
convert	Improvements for supporting UI Location (#3146)	7 years ago
misc	Update swagger documentation (#2899)	7 years ago
org	Fix ignored errors when checking if organization, team member (#3177)	7 years ago
repo	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
swagger	Update swagger documentation (#2899)	7 years ago
user	Refactor struct's time to remove unnecessary memory usage (#3142)	7 years ago
utils	Fix API status code for hook creation (#2814)	7 years ago
api.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago