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

Refactor session close as xorm already does everything needed internally (#2020)

2017-06-21 08:57:05 +08:00

v14.go

Fix typos in models/ and modules/ (#1248)

2017-03-15 08:52:01 +08:00

v15.go

Rewrite migrations to not depend on future code changes (#2604)

2017-10-08 19:08:18 +08:00

v16.go

Rewrite migrations to not depend on future code changes (#2604)

2017-10-08 19:08:18 +08:00

v17.go

Protected branches system (#339)

2017-02-21 23:02:10 +08:00

v18.go

Take back control of hooks (#1006)

2017-02-23 11:40:44 +08:00

v19.go

Use buffersize to reduce database connection when iterate (#2724)

2017-10-21 14:26:23 +08:00

v20.go

fix avatar update bug (#1729)

2017-05-16 08:36:09 +08:00

v21.go

Fix lint errors (#2547)

2017-09-19 11:08:30 +03:00

v22.go

Use buffersize to reduce database connection when iterate (#2724)

2017-10-21 14:26:23 +08:00

v23.go

Run "make fmt" with go-1.6 (#1333)

2017-03-21 08:55:00 +08:00

v24.go

fix gpg wrong column types

2017-03-20 02:55:07 +01:00

v25.go

Show user OpenID URIs in their profile (#1314)

2017-03-20 09:31:08 +01:00

v26.go

Use buffersize to reduce database connection when iterate (#2724)

2017-10-21 14:26:23 +08:00

v27.go

Fix broken migration v27 (#1504)

2017-04-30 10:08:16 +08:00

v28.go

Replace deprecated Id method with ID (#2655)

2017-10-05 07:43:04 +03:00

v29.go

Status-API (#1332)

2017-04-21 19:32:31 +08:00

v30.go

Add primary key and index to external login user table (#1656)

2017-05-02 16:41:44 +08:00

v31.go

Add units to team (#947)

2017-05-18 22:54:24 +08:00

v32.go

Add units to team (#947)

2017-05-18 22:54:24 +08:00

v33.go

Rename misnamed migration (#1867)

2017-06-04 11:09:50 +08:00

v34.go

Migration to fix existing owner team units (#1873)

2017-06-05 05:40:25 -05:00

v35.go

Fix "Dashboard shows deleted comments" (#1995)

2017-06-25 20:20:29 +02:00

v36.go

Fix git hooks update to receive required arguments. Fixes #2090 (#2095)

2017-07-02 21:50:57 +08:00

v37.go

Rewrite migrations to not depend on future code changes (#2604)

2017-10-08 19:08:18 +08:00

v38.go

Rewrite migrations to not depend on future code changes (#2604)

2017-10-08 19:08:18 +08:00

v39.go

Add repo-sync-releases admin command (#3254)

2017-12-31 16:45:46 +02:00

v40.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v41.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v45.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v46.go

Fix organization watch migration (#2703)

2017-10-14 20:47:05 +03:00

v47.go

Add branch overiew page (#2108)

2017-10-26 08:49:16 +08:00

v48.go

Code/repo search (#2582)

2017-10-27 09:10:54 +03:00

v49.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v50.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v51.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v52.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

v53.go

Reorder migrations, skip errors if running migration again (#3160)

2017-12-13 16:52:18 +02:00

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