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	Integration test for activity page (#2704)	2017-10-16 00:54:53 +03:00
attachment.go	Allow custom public files (#782)	2017-01-28 23:14:56 +01:00
branch.go	Make URL scheme unambiguous (#2408)	2017-10-30 10:04:25 +08:00
commit.go	Fix go-get, src and raw urls to new scheme (#2978)	2017-11-27 02:58:54 +02:00
download.go	Memory usage improvements (#3013)	2017-11-29 09:50:39 +08:00
editor.go	Memory usage improvements (#3013)	2017-11-29 09:50:39 +08:00
http.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
issue_label_test.go	Unit tests for routers/repo/issue_label (#3198)	2017-12-15 23:11:02 +02:00
issue_label.go	Unit tests for routers/repo/issue_label (#3198)	2017-12-15 23:11:02 +02:00
issue_stopwatch.go	Fix PR, milestone and label functionality if issue unit is disabled (#2710)	2017-10-16 10:55:43 +03:00
issue_timetrack.go	Fix PR, milestone and label functionality if issue unit is disabled (#2710)	2017-10-16 10:55:43 +03:00
issue_watch.go	Fix PR, milestone and label functionality if issue unit is disabled (#2710)	2017-10-16 10:55:43 +03:00
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
main_test.go	Unit tests for wiki routers (#3022)	2017-11-30 17:52:15 +02:00
middlewares.go	golint fixed for routers/repo/middlewares.go (#204)	2016-11-21 18:03:37 +08:00
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_test.go	Fix missing branch in release bug (#3108)	2017-12-08 13:22:02 +08:00
release.go	Fix missing branch in release bug (#3108)	2017-12-08 13:22:02 +08:00
repo.go	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
search.go	Fix go-get, src and raw urls to new scheme (#2978)	2017-11-27 02:58:54 +02:00
setting_protected_branch.go	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00
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
view.go	Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092)	2017-12-08 20:21:37 +08:00
webhook.go	Fix guide link for webhooks in repository settings (#3291) (#3292)	2018-01-03 23:50:09 +08:00
wiki_test.go	Unit tests for wiki routers (#3022)	2017-11-30 17:52:15 +02:00
wiki.go	Fix wiki page list not rendering after updatedunix changes (#3175)	2017-12-13 21:46:56 +08:00