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
..
activity.go
attachment.go
branch.go
commit.go
download.go
editor.go
http.go
issue.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
issue_label.go	Unit tests for routers/repo/issue_label (#3198)	2017-12-15 23:11:02 +02:00
issue_label_test.go	Unit tests for routers/repo/issue_label (#3198)	2017-12-15 23:11:02 +02:00
issue_stopwatch.go
issue_timetrack.go
issue_watch.go
main_test.go
middlewares.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
release_test.go
repo.go	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
search.go
setting.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
setting_protected_branch.go
view.go
webhook.go	Fix guide link for webhooks in repository settings (#3291) (#3292)	2018-01-03 23:50:09 +08:00
wiki.go
wiki_test.go