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
..
ldap Gogs -> Gitea (#2909) 7 years ago
oauth2 Additional OAuth2 providers (#1010) 7 years ago
openid Run "make fmt" with go-1.6 (#1333) 7 years ago
pam golint fixed for modules/auth 8 years ago
admin.go Better URL validation (#1507) 7 years ago
auth.go Refactor struct's time to remove unnecessary memory usage (#3142) 7 years ago
auth_form.go LDAP user synchronization (#1478) 7 years ago
org.go Add units to team (#947) 7 years ago
repo_branch_form.go Create new branch from branch selection dropdown (#2130) 7 years ago
repo_form.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 7 years ago
user_form.go Feature: Timetracking (#2211) 7 years ago
user_form_auth_openid.go Run "make fmt" with go-1.6 (#1333) 7 years ago