gitea/modules/auth
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
..
ldap Gogs -> Gitea (#2909) 2017-11-14 08:55:57 +08:00
oauth2 Additional OAuth2 providers (#1010) 2017-05-01 21:26:53 +08:00
openid Run "make fmt" with go-1.6 (#1333) 2017-03-21 08:55:00 +08:00
pam golint fixed for modules/auth 2016-11-27 21:39:06 +08:00
admin.go Better URL validation (#1507) 2017-04-19 11:02:20 +08:00
auth.go Refactor struct's time to remove unnecessary memory usage (#3142) 2017-12-11 06:37:04 +02:00
auth_form.go LDAP user synchronization (#1478) 2017-05-10 15:10:18 +02:00
org.go Add units to team (#947) 2017-05-18 22:54:24 +08:00
repo_branch_form.go Create new branch from branch selection dropdown (#2130) 2017-10-15 22:59:24 +03:00
repo_form.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
user_form.go Feature: Timetracking (#2211) 2017-09-12 09:48:13 +03:00
user_form_auth_openid.go Run "make fmt" with go-1.6 (#1333) 2017-03-21 08:55:00 +08:00