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
..
gitea-repositories-meta
api_admin_test.go
api_branch_test.go
api_comment_test.go
api_fork_test.go
api_gpg_keys_test.go
api_issue_label_test.go
api_issue_test.go
api_keys_test.go
api_pull_test.go
api_repo_lfs_locks_test.go
api_repo_raw_test.go
api_repo_test.go
api_team_test.go
bare_repo_test.go
benchmarks_test.go
branches_test.go
change_default_branch_test.go
delete_user_test.go
editor_test.go
explore_repos_test.go
git_test.go
html_helper.go
integration_test.go
internal_test.go
issue_test.go
links_test.go
mysql.ini.tmpl
pgsql.ini.tmpl
pull_compare_test.go
pull_create_test.go
pull_merge_test.go
release_test.go
repo_activity_test.go
repo_branch_test.go
repo_commits_test.go
repo_fork_test.go
repo_migrate_test.go
repo_search_test.go
repo_test.go
setting_test.go
signin_test.go
signout_test.go
signup_test.go
sqlite.ini
timetracking_test.go
user_test.go
version_test.go
xss_test.go