0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-01-20 21:36:13 +01:00
gitea/options/locale
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
..
locale_bg-BG.ini
locale_cs-CZ.ini
locale_de-DE.ini
locale_en-US.ini Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188) 2018-01-05 20:56:50 +02:00
locale_es-ES.ini
locale_fi-FI.ini
locale_fr-FR.ini
locale_hu-HU.ini
locale_it-IT.ini
locale_ja-JP.ini
locale_ko-KR.ini
locale_lt-LT.ini
locale_lv-LV.ini
locale_nb-NO.ini
locale_nl-NL.ini
locale_nn-NO.ini
locale_no-NO.ini
locale_pl-PL.ini
locale_pt-BR.ini
locale_ru-RU.ini
locale_sr-SP.ini
locale_sv-SE.ini
locale_tr-TR.ini
locale_zh-CN.ini
locale_zh-HK.ini
locale_zh-TW.ini
TRANSLATORS