You can not 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
..
migrations.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago
v13.go	Refactor session close as xorm already does everything needed internally (#2020)	8 years ago
v14.go	…
v15.go	Rewrite migrations to not depend on future code changes (#2604)	8 years ago
v16.go	Rewrite migrations to not depend on future code changes (#2604)	8 years ago
v17.go	…
v18.go	…
v19.go	Use buffersize to reduce database connection when iterate (#2724)	8 years ago
v20.go	…
v21.go	Fix lint errors (#2547)	8 years ago
v22.go	Use buffersize to reduce database connection when iterate (#2724)	8 years ago
v23.go	…
v24.go	…
v25.go	…
v26.go	Use buffersize to reduce database connection when iterate (#2724)	8 years ago
v27.go	…
v28.go	Replace deprecated Id method with ID (#2655)	8 years ago
v29.go	…
v30.go	…
v31.go	…
v32.go	…
v33.go	…
v34.go	…
v35.go	Fix "Dashboard shows deleted comments" (#1995)	8 years ago
v36.go	Fix git hooks update to receive required arguments. Fixes #2090 (#2095)	8 years ago
v37.go	Rewrite migrations to not depend on future code changes (#2604)	8 years ago
v38.go	Rewrite migrations to not depend on future code changes (#2604)	8 years ago
v39.go	Add repo-sync-releases admin command (#3254)	7 years ago
v40.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v41.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v45.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v46.go	Fix organization watch migration (#2703)	8 years ago
v47.go	Add branch overiew page (#2108)	8 years ago
v48.go	Code/repo search (#2582)	8 years ago
v49.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v50.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v51.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v52.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v53.go	Reorder migrations, skip errors if running migration again (#3160)	7 years ago
v54.go	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	7 years ago