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
..
branches.tmpl
collaboration.tmpl
deploy_keys.tmpl	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
githook_edit.tmpl
githooks.tmpl
hook_delete_modal.tmpl
hook_dingtalk.tmpl	Add dingtalk webhook (#2777)	2017-11-21 06:26:43 +02:00
hook_discord.tmpl
hook_gitea.tmpl
hook_gogs.tmpl
hook_history.tmpl
hook_list.tmpl	Add dingtalk webhook (#2777)	2017-11-21 06:26:43 +02:00
hook_new.tmpl	Add dingtalk webhook (#2777)	2017-11-21 06:26:43 +02:00
hook_settings.tmpl
hook_slack.tmpl
hooks.tmpl
nav.tmpl
navbar.tmpl
options.tmpl	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
protected_branch.tmpl