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.
gitea/modules
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
base Refactor struct's time to remove unnecessary memory usage (#3142) 7 years ago
cache
context Fix ignored errors when checking if organization, team member (#3177) 7 years ago
cron
highlight
httplib
indexer
lfs Improve LFS tests + fix lfs url refs + keep path upper/lowercase in db. (#3092) 7 years ago
log
mailer
markup
minwinsvc
notification
options
private
process
public
search
setting Add an option to allow redirect of http port 80 to https. (#1928) 7 years ago
ssh
sync
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
util Improvements for supporting UI Location (#3146) 7 years ago
validation