forgejo/models/migrations
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
..
migrations.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
v13.go
v14.go
v15.go
v16.go
v17.go
v18.go
v19.go
v20.go
v21.go
v22.go
v23.go
v24.go
v25.go
v26.go
v27.go
v28.go
v29.go
v30.go
v31.go
v32.go
v33.go
v34.go
v35.go
v36.go
v37.go
v38.go
v39.go
v40.go
v41.go
v45.go
v46.go
v47.go
v48.go
v49.go
v50.go
v51.go
v52.go
v53.go
v54.go Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00