0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-25 00:44:15 -05:00
forgejo/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 [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_cs-CZ.ini [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_de-DE.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
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 [skip ci] Updated translations via Crowdin 2017-11-15 08:12:05 +00:00
locale_fi-FI.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_fr-FR.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_hu-HU.ini [skip ci] Updated translations via Crowdin 2018-01-02 12:14:47 +00:00
locale_it-IT.ini [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_ja-JP.ini [skip ci] Updated translations via Crowdin 2017-11-14 23:40:26 +00:00
locale_ko-KR.ini [skip ci] Updated translations via Crowdin 2017-11-14 23:40:26 +00:00
locale_lt-LT.ini [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_lv-LV.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_nb-NO.ini [skip ci] Updated translations via Crowdin 2017-11-29 12:50:43 +00:00
locale_nl-NL.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_nn-NO.ini '[skip ci] Updated translations via Crowdin' 2017-11-01 19:44:17 +00:00
locale_no-NO.ini [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_pl-PL.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_pt-BR.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_ru-RU.ini [skip ci] Updated translations via Crowdin 2018-01-03 08:35:03 +00:00
locale_sr-SP.ini [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_sv-SE.ini [skip ci] Updated translations via Crowdin 2017-11-15 08:12:05 +00:00
locale_tr-TR.ini [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
locale_zh-CN.ini [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
locale_zh-HK.ini [skip ci] Updated translations via Crowdin 2017-11-15 03:35:51 +00:00
locale_zh-TW.ini [skip ci] Updated translations via Crowdin 2017-12-03 05:31:04 +00:00
TRANSLATORS Update TRANSLATORS (#2843) 2017-11-04 17:56:06 +02:00