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
..
auth	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
avatar
base	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
cache
context	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
cron
highlight
httplib
indexer
lfs
log
mailer
markup
minwinsvc
notification
options
private
process
public
search
setting	Add an option to allow redirect of http port 80 to https. (#1928)	2017-12-25 23:23:43 +01:00
ssh
sync
templates	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
test	Unit tests for routers/repo/issue_label (#3198)	2017-12-15 23:11:02 +02:00
user
util	Improvements for supporting UI Location (#3146)	2017-12-14 07:45:31 +08:00
validation