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
..
access.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
access_token.yml
action.yml	Fix user profile activity feed (#1848)	2017-06-02 08:42:25 +08:00
attachment.yml
collaboration.yml
comment.yml	Feature: Timetracking (#2211)	2017-09-12 09:48:13 +03:00
commit_status.yml
deleted_branch.yml	Add deleted_branch table fixture (#2832)	2017-11-04 15:31:59 +02:00
email_address.yml
follow.yml
gpg_key.yml	Add missing fixture to clean gpg_key table (#2494)	2017-09-12 13:54:45 +03:00
hook_task.yml
issue.yml	Fix bugs in issue dashboard stats (#3073)	2017-12-26 01:25:16 +02:00
issue_label.yml
issue_user.yml
issue_watch.yml	Hide unactive on explore users and some refactors (#2741)	2017-10-24 20:36:19 +03:00
label.yml
milestone.yml
notice.yml
notification.yml	Add 'mark all read' option to notifications (#3097)	2017-12-07 13:52:57 +08:00
org_user.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
protected_branch.yml
public_key.yml	Fixtures for public_key table (#3140)	2017-12-11 09:50:29 +08:00
pull_request.yml
reaction.yml	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
release.yml	Fix release display and correct paging (#2080)	2017-06-29 23:11:38 +08:00
repo_indexer_status.yml	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
repo_redirect.yml
repo_unit.yml	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
repository.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
star.yml
stopwatch.yml	Feature: Timetracking (#2211)	2017-09-12 09:48:13 +03:00
team.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
team_repo.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
team_user.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
tracked_time.yml	Feature: Timetracking (#2211)	2017-09-12 09:48:13 +03:00
user.yml	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
user_open_id.yml
watch.yml	Hide unactive on explore users and some refactors (#2741)	2017-10-24 20:36:19 +03:00
webhook.yml