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
..
auth	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
avatar	Use assert in legacy unit tests (#867)	2017-02-08 14:29:07 +08:00
base	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
cache	Fix memcache support when value is returned as string always (#2924)	2017-11-16 15:06:34 +08:00
context	Fix ignored errors when checking if organization, team member (#3177)	2017-12-21 09:43:26 +02:00
cron	Add branch overiew page (#2108)	2017-10-26 08:49:16 +08:00
highlight	No highlighting for .txt files (#1922)	2017-06-09 19:39:16 -05:00
httplib	Add internal routes for ssh hook comands (#1471)	2017-04-19 11:45:01 +08:00
indexer	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
lfs	Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092)	2017-12-08 20:21:37 +08:00
log	Fix lint errors (#2547)	2017-09-19 11:08:30 +03:00
mailer	Add support for extra sendmail arguments (#2731)	2017-10-25 22:27:25 +03:00
markup	Fix issue link rendering in commit messages (#2897)	2017-11-13 09:35:55 +08:00
minwinsvc	Fix Git hooks not being executed on Windows when running as a service (#1149)	2017-03-09 09:27:43 +08:00
notification
options	Fix typos in models/ and modules/ (#1248)	2017-03-15 08:52:01 +08:00
private	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00
process	Fix run command race (#1470)	2017-11-13 22:51:45 +08:00
public
search	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
setting	Add an option to allow redirect of http port 80 to https. (#1928)	2017-12-25 23:23:43 +01:00
ssh	Configurable SSH key exchange algorithm and MAC suite (#2806)	2017-11-02 23:26:41 +08:00
sync	Fix status table race condition (#1835)	2017-05-31 16:57:17 +08:00
templates	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
test	Unit tests for routers/repo/issue_label (#3198)	2017-12-15 23:11:02 +02:00
user
util	Improvements for supporting UI Location (#3146)	2017-12-14 07:45:31 +08:00
validation	Create new branch from branch selection dropdown (#2130)	2017-10-15 22:59:24 +03:00