You cannot 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
..
auth	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
avatar	Use assert in legacy unit tests (#867)	8 years ago
base	Refactor struct's time to remove unnecessary memory usage (#3142)	7 years ago
cache	Fix memcache support when value is returned as string always (#2924)	7 years ago
context	Fix ignored errors when checking if organization, team member (#3177)	7 years ago
cron	Add branch overiew page (#2108)	7 years ago
highlight	No highlighting for .txt files (#1922)	8 years ago
httplib	Add internal routes for ssh hook comands (#1471)	8 years ago
indexer	Code/repo search (#2582)	7 years ago
lfs	Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092)	7 years ago
log	Fix lint errors (#2547)	8 years ago
mailer	Add support for extra sendmail arguments (#2731)	7 years ago
markup	Fix issue link rendering in commit messages (#2897)	7 years ago
minwinsvc	Fix Git hooks not being executed on Windows when running as a service (#1149)	8 years ago
notification	Notification - Step 1 (#523)	8 years ago
options	Fix typos in models/ and modules/ (#1248)	8 years ago
private	improve protected branch to add whitelist support (#2451)	8 years ago
process	Fix run command race (#1470)	7 years ago
public	Allow custom public files (#782)	8 years ago
search	Code/repo search (#2582)	7 years ago
setting	Add an option to allow redirect of http port 80 to https. (#1928)	7 years ago
ssh	Configurable SSH key exchange algorithm and MAC suite (#2806)	7 years ago
sync	Fix status table race condition (#1835)	8 years ago
templates	Refactor struct's time to remove unnecessary memory usage (#3142)	7 years ago
test	Unit tests for routers/repo/issue_label (#3198)	7 years ago
user	golint fixed for modules/user	8 years ago
util	Improvements for supporting UI Location (#3146)	7 years ago
validation	Create new branch from branch selection dropdown (#2130)	7 years ago