You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
7 years ago
..
fixtures
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
7 years ago
migrations
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
7 years ago
access.go
…
access_test.go
…
action.go
…
action_test.go
…
admin.go
…
admin_test.go
…
attachment.go
…
attachment_test.go
…
branches.go
…
branches_test.go
…
consistency.go
…
error.go
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
7 years ago
error_oauth2.go
…
external_login_user.go
…
git_diff.go
…
git_diff_test.go
…
gpg_key.go
…
gpg_key_test.go
…
graph.go
…
graph_test.go
…
helper.go
…
issue.go
…
issue_comment.go
…
issue_comment_test.go
…
issue_indexer.go
…
issue_label.go
…
issue_label_test.go
…
issue_list.go
…
issue_list_test.go
…
issue_mail.go
…
issue_milestone.go
…
issue_milestone_test.go
…
issue_reaction.go
…
issue_reaction_test.go
…
issue_stopwatch.go
…
issue_stopwatch_test.go
…
issue_test.go
…
issue_tracked_time.go
…
issue_tracked_time_test.go
…
issue_user.go
…
issue_user_test.go
…
issue_watch.go
…
issue_watch_test.go
…
lfs.go
…
lfs_lock.go
…
login_source.go
…
mail.go
…
main_test.go
…
models.go
…
models_sqlite.go
…
models_test.go
…
models_tidb.go
…
notification.go
…
notification_test.go
…
oauth2.go
…
org.go
…
org_team.go
…
org_team_test.go
…
org_test.go
…
pull.go
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
7 years ago
pull_test.go
…
release.go
…
repo.go
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
7 years ago
repo_activity.go
…
repo_branch.go
…
repo_collaboration.go
…
repo_collaboration_test.go
…
repo_editor.go
…
repo_indexer.go
…
repo_issue.go
…
repo_list.go
…
repo_list_test.go
…
repo_mirror.go
…
repo_redirect.go
…
repo_redirect_test.go
…
repo_test.go
…
repo_unit.go
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge ( #3188 )
7 years ago
repo_watch.go
…
repo_watch_test.go
…
ssh_key.go
…
ssh_key_test.go
…
star.go
…
star_test.go
…
status.go
…
status_test.go
…
test_fixtures.go
…
token.go
…
token_test.go
…
twofactor.go
…
unit.go
…
unit_tests.go
…
update.go
…
update_test.go
…
user.go
…
user_follow.go
…
user_follow_test.go
…
user_mail.go
…
user_mail_test.go
…
user_openid.go
…
user_openid_test.go
…
user_test.go
…
webhook.go
…
webhook_dingtalk.go
…
webhook_discord.go
…
webhook_slack.go
…
webhook_test.go
…
wiki.go
…
wiki_test.go
…
Lauris BH