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
..
activity.go	Integration test for activity page (#2704)	7 years ago
attachment.go	Allow custom public files (#782)	8 years ago
branch.go	Make URL scheme unambiguous (#2408)	7 years ago
commit.go	Fix go-get, src and raw urls to new scheme (#2978)	7 years ago
download.go	Memory usage improvements (#3013)	7 years ago
editor.go	Memory usage improvements (#3013)	7 years ago
http.go	Refactor struct's time to remove unnecessary memory usage (#3142)	7 years ago
issue.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
issue_label.go	Unit tests for routers/repo/issue_label (#3198)	7 years ago
issue_label_test.go	Unit tests for routers/repo/issue_label (#3198)	7 years ago
issue_stopwatch.go	Fix PR, milestone and label functionality if issue unit is disabled (#2710)	7 years ago
issue_timetrack.go	Fix PR, milestone and label functionality if issue unit is disabled (#2710)	7 years ago
issue_watch.go	Fix PR, milestone and label functionality if issue unit is disabled (#2710)	7 years ago
main_test.go	Unit tests for wiki routers (#3022)	7 years ago
middlewares.go	golint fixed for routers/repo/middlewares.go (#204)	8 years ago
pull.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
release.go	Fix missing branch in release bug (#3108)	7 years ago
release_test.go	Fix missing branch in release bug (#3108)	7 years ago
repo.go	Fix ignored errors when checking if organization, team member (#3177)	7 years ago
search.go	Fix go-get, src and raw urls to new scheme (#2978)	7 years ago
setting.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
setting_protected_branch.go	improve protected branch to add whitelist support (#2451)	7 years ago
view.go	Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092)	7 years ago
webhook.go	Fix guide link for webhooks in repository settings (#3291) (#3292)	7 years ago
wiki.go	Fix wiki page list not rendering after updatedunix changes (#3175)	7 years ago
wiki_test.go	Unit tests for wiki routers (#3022)	7 years ago