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	Enable admin to search by email (#2888)	2017-11-26 16:40:38 +08:00
api/v1	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
dev	Make time diff translatable (#2057)	2017-06-28 13:43:28 +08:00
org	Allow adding collaborators with (fullname) (#3103)	2017-12-07 15:00:09 +08:00
private	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08: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
routes	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
user	Fix bugs in issue dashboard stats (#3073)	2017-12-26 01:25:16 +02:00
utils	Allow adding collaborators with (fullname) (#3103)	2017-12-07 15:00:09 +08:00
home.go	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
init.go	Set session and indexers' data files rel to AppDataPath (#2192)	2017-11-03 10:56:20 +02:00
install.go	Default log level to Info without hardcoding it in installer (#3041)	2017-12-01 15:41:27 +08:00