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
..
fixtures	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
migrations	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
access_test.go
access.go
action_test.go	Fix ref parsing in commit messages (#3067)	2017-12-03 10:20:12 +08:00
action.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
admin_test.go
admin.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
attachment_test.go
attachment.go	Small improve on deleting attachements (#3145)	2017-12-24 23:04:22 +02:00
branches_test.go	Add deleted_branch table fixture (#2832)	2017-11-04 15:31:59 +02:00
branches.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
consistency.go
error_oauth2.go
error.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
external_login_user.go
git_diff_test.go
git_diff.go	Fix Uninitialized variable in ParsePatch (#3156)	2017-12-12 02:32:36 +02:00
gpg_key_test.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
gpg_key.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
graph_test.go
graph.go
helper.go	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
issue_comment_test.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue_comment.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue_indexer.go	Add repo-sync-releases admin command (#3254)	2017-12-31 16:45:46 +02:00
issue_label_test.go
issue_label.go
issue_list_test.go
issue_list.go	Remove unnecessary IssueList attribute loads (#2936)	2017-11-21 13:28:22 +08:00
issue_mail.go	Issue content should not be updated when closing with comment (#2833)	2017-11-03 17:23:17 +08:00
issue_milestone_test.go	Check ignored errors for issue and milestone count (#3213)	2017-12-18 16:06:51 +02:00
issue_milestone.go	Check ignored errors for issue and milestone count (#3213)	2017-12-18 16:06:51 +02:00
issue_reaction_test.go	Tests for reactions (#3083)	2017-12-05 22:57:01 +02:00
issue_reaction.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue_stopwatch_test.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue_stopwatch.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue_test.go	Fix bugs in issue dashboard stats (#3073)	2017-12-26 01:25:16 +02:00
issue_tracked_time_test.go
issue_tracked_time.go	Improvements for supporting UI Location (#3146)	2017-12-14 07:45:31 +08:00
issue_user_test.go
issue_user.go
issue_watch_test.go	Hide unactive on explore users and some refactors (#2741)	2017-10-24 20:36:19 +03:00
issue_watch.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue.go	Use issue number/index instead of id for API URL. (#3298)	2018-01-03 19:41:33 -06:00
lfs_lock.go	Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092)	2017-12-08 20:21:37 +08:00
lfs.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
login_source.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
mail.go	Issue content should not be updated when closing with comment (#2833)	2017-11-03 17:23:17 +08:00
main_test.go	Unit tests for wiki routers (#3022)	2017-11-30 17:52:15 +02:00
models_sqlite.go
models_test.go
models_tidb.go
models.go	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
notification_test.go	Add 'mark all read' option to notifications (#3097)	2017-12-07 13:52:57 +08:00
notification.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
oauth2.go
org_team_test.go	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
org_team.go	Fix race condition in team functions (#3268)	2017-12-30 21:08:08 -06:00
org_test.go	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
org.go	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
pull_test.go
pull.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
release.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
repo_activity.go	Integration test for activity page (#2704)	2017-10-16 00:54:53 +03:00
repo_branch.go	Create new branch from branch selection dropdown (#2130)	2017-10-15 22:59:24 +03:00
repo_collaboration_test.go
repo_collaboration.go
repo_editor.go	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
repo_indexer.go	Add repo-sync-releases admin command (#3254)	2017-12-31 16:45:46 +02:00
repo_issue.go
repo_list_test.go	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
repo_list.go	Add repo-sync-releases admin command (#3254)	2017-12-31 16:45:46 +02:00
repo_mirror.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
repo_redirect_test.go
repo_redirect.go
repo_test.go	Fix repo-transfer-and-team-repo-count bug (#3241)	2017-12-19 23:37:56 -06:00
repo_unit.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
repo_watch_test.go	Hide unactive on explore users and some refactors (#2741)	2017-10-24 20:36:19 +03:00
repo_watch.go
repo.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
ssh_key_test.go
ssh_key.go	Improvements for supporting UI Location (#3146)	2017-12-14 07:45:31 +08:00
star_test.go
star.go
status_test.go
status.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
test_fixtures.go
token_test.go
token.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
twofactor.go	go back to using CFB for AES decryption/encryption for 2FA (#3274)	2017-12-31 04:19:42 +02:00
unit_tests.go	Add more bench (#3161)	2017-12-24 02:33:34 +02:00
unit.go
update_test.go
update.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
user_follow_test.go
user_follow.go
user_mail_test.go
user_mail.go
user_openid_test.go
user_openid.go
user_test.go	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
user.go	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
webhook_dingtalk.go	Add dingtalk webhook (#2777)	2017-11-21 06:26:43 +02:00
webhook_discord.go	fix discord hook bug (#2778)	2017-10-25 13:13:45 +08:00
webhook_slack.go	Make URL scheme unambiguous (#2408)	2017-10-30 10:04:25 +08:00
webhook_test.go
webhook.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
wiki_test.go	Unit tests for wiki routers (#3022)	2017-11-30 17:52:15 +02:00
wiki.go	Various wiki bug fixes (#2996)	2017-11-28 17:43:51 +08:00