Skip to content

Commit 13bb69b

Browse files
authored
Merge branch 'master' into assets_dir
2 parents 9c0d81f + d42509a commit 13bb69b

File tree

90 files changed

+759
-694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+759
-694
lines changed

.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ insert_final_newline = true
1212
[*.{go,tmpl,html}]
1313
indent_style = tab
1414

15+
[templates/custom/*.tmpl]
16+
insert_final_newline = false
17+
18+
[templates/swagger/v1_json.tmpl]
19+
indent_style = space
20+
1521
[Makefile]
1622
indent_style = tab
1723

CHANGELOG.md

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,17 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7-
## [1.14.0-RC2](https://github.com/go-gitea/gitea/releases/tag/v1.14.0-rc2) - 2021-03-22
8-
9-
* SECURITY
10-
* Fix bug on avatar middleware (#15124) (#15125)
11-
* Fix another clusterfuzz identified issue (#15096) (#15113)
12-
* Update to goldmark 1.3.3 (#15059) (#15060)
13-
* BUGFIXES
14-
* Fix the v176 migration (#15110) (#15111)
15-
* Fix double 'push tag' action feed (#15078) (#15083)
16-
* Remove possible resource leak (#15067) (#15082)
17-
* Handle unauthorized user events gracefully (#15071) (#15074)
18-
19-
## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0-rc1) - 2021-03-19
7+
## [1.14.0](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-04-11
208

219
* SECURITY
2210
* Respect approved email domain list for externally validated user registration (#15014)
2311
* Add reverse proxy configuration support for remote IP address detection (#14959)
2412
* Ensure validation occurs on clone addresses too (#14994)
2513
* Fix several render issues highlighted during fuzzing (#14986)
2614
* BREAKING
15+
* Fix double 'push tag' action feed (#15078) (#15083)
16+
* Remove possible resource leak (#15067) (#15082)
17+
* Handle unauthorized user events gracefully (#15071) (#15074)
2718
* Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
2819
* Migrate from Macaron to Chi framework (#14293)
2920
* Deprecate building for mips (#14174)
@@ -54,6 +45,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
5445
* Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244)
5546
* Create Rootless Docker image (#10154)
5647
* API
48+
* Speedup issue search (#15179) (#15192)
5749
* Get pull, return head branch sha, even if deleted (#14931)
5850
* Export LFS & TimeTracking function status (#14753)
5951
* Show Gitea version in swagger (#14654)
@@ -78,6 +70,20 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
7870
* Add more filters to issues search (#13514)
7971
* Add review request api (#11355)
8072
* BUGFIXES
73+
* Fix delete nonexist oauth application 500 and prevent deadlock (#15384) (#15396)
74+
* Always set the merge base used to merge the commit (#15352) (#15385)
75+
* Upgrade to bluemonday 1.0.7 (#15379) (#15380)
76+
* Turn RepoRef and RepoAssignment back into func(*Context) (#15372) (#15377)
77+
* Move FCGI req.URL.Path fix-up to the FCGI listener (#15292) (#15361)
78+
* Show diff on rename with diff changes (#15338) (#15339)
79+
* Fix handling of logout event (#15323) (#15337)
80+
* Fix CanCreateRepo check (#15311) (#15321)
81+
* Fix xorm log stack level (#15285) (#15316)
82+
* Fix bug in Wrap (#15302) (#15309)
83+
* Drop the event source if we are unauthorized (#15275) (#15280)
84+
* Backport Fix graph pagination (#15225) (#15249)
85+
* Prevent NPE in CommentMustAsDiff if no hunk header (#15199) (#15200)
86+
* should run RetrieveRepoMetas() for empty pr (#15187) (#15190)
8187
* Move setting to enable closing issue via commit in non default branch to repo settings (#14965)
8288
* Show correct issues for team dashboard (#14952)
8389
* Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity (#14932)
@@ -134,6 +140,9 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
134140
* Use GO variable in go-check target (#13146) (#13147)
135141
* ENHANCEMENTS
136142
* UI style improvements
143+
* Dropzone styling improvements (#15291) (#15374)
144+
* Add size to Save function (#15264) (#15270)
145+
* Monaco improvements (#15333) (#15345)
137146
* Support .mailmap in code activity stats (#15009)
138147
* Sort release attachments by name (#15008)
139148
* Add ui.explore settings to control view of explore pages (#14094)

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ lint: lint-frontend lint-backend
325325
lint-frontend: node_modules
326326
npx eslint --color --max-warnings=0 web_src/js build templates *.config.js
327327
npx stylelint --color --max-warnings=0 web_src/less
328+
npx editorconfig-checker templates
328329

329330
.PHONY: lint-backend
330331
lint-backend: golangci-lint revive vet

docs/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params:
1818
description: Git with a cup of tea
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
21-
version: 1.13.7
21+
version: 1.14.0
2222
minGoVersion: 1.14
2323
goVersion: 1.16
2424
minNodeVersion: 12.17

modules/git/blob_test.go

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,23 @@ package git
77

88
import (
99
"io/ioutil"
10+
"path/filepath"
1011
"testing"
1112

1213
"github.com/stretchr/testify/assert"
1314
"github.com/stretchr/testify/require"
1415
)
1516

1617
func TestBlob_Data(t *testing.T) {
17-
output := `Copyright (c) 2016 The Gitea Authors
18-
Copyright (c) 2015 The Gogs Authors
19-
20-
Permission is hereby granted, free of charge, to any person obtaining a copy
21-
of this software and associated documentation files (the "Software"), to deal
22-
in the Software without restriction, including without limitation the rights
23-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
24-
copies of the Software, and to permit persons to whom the Software is
25-
furnished to do so, subject to the following conditions:
26-
27-
The above copyright notice and this permission notice shall be included in
28-
all copies or substantial portions of the Software.
29-
30-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
36-
THE SOFTWARE.
37-
`
38-
repo, err := OpenRepository("../../.git")
39-
assert.NoError(t, err)
18+
output := "file2\n"
19+
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
20+
repo, err := OpenRepository(bareRepo1Path)
21+
if !assert.NoError(t, err) {
22+
t.Fatal()
23+
}
4024
defer repo.Close()
4125

42-
testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
26+
testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
4327
assert.NoError(t, err)
4428

4529
r, err := testBlob.DataAsync()
@@ -53,13 +37,14 @@ THE SOFTWARE.
5337
}
5438

5539
func Benchmark_Blob_Data(b *testing.B) {
56-
repo, err := OpenRepository("../../.git")
40+
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
41+
repo, err := OpenRepository(bareRepo1Path)
5742
if err != nil {
5843
b.Fatal(err)
5944
}
6045
defer repo.Close()
6146

62-
testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
47+
testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
6348
if err != nil {
6449
b.Fatal(err)
6550
}

options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,6 @@ issues.context.edit=Upravit
10961096
issues.context.delete=Smazat
10971097
issues.no_content=Není zde žádný obsah.
10981098
issues.close_issue=Zavřít
1099-
issues.pull_merged_at=`sloučil(a) revizi <a href="%[1]s">%[2]s</a> do <b>%[3]s</b> %[4]s`
11001099
issues.close_comment_issue=Okomentovat a zavřít
11011100
issues.reopen_issue=Znovuotevřít
11021101
issues.reopen_comment_issue=Okomentovat a znovuotevřít
@@ -1187,7 +1186,6 @@ issues.error_modifying_due_date=Změna termínu dokončení selhala.
11871186
issues.error_removing_due_date=Odstranění termínu dokončení selhalo.
11881187
issues.push_commit_1=přidal(a) %d revizi %s
11891188
issues.push_commits_n=přidal(a) %d revize %s
1190-
issues.force_push_codes=`vynucené nahrání %[1]s z <a href="%[3]s">%[2]s</a> do <a href="%[5]s">%[4]s</a> %[6]s`
11911189
issues.due_date_form=rrrr-mm-dd
11921190
issues.due_date_form_add=Přidat termín dokončení
11931191
issues.due_date_form_edit=Upravit

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,8 +1112,6 @@ issues.context.edit=Bearbeiten
11121112
issues.context.delete=Löschen
11131113
issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt.
11141114
issues.close_issue=Schließen
1115-
issues.pull_merged_at=`hat den Commit <a href="%[1]s">%[2]s</a> in <b>%[3]s</b> %[4]s gemergt`
1116-
issues.manually_pull_merged_at=`hat %[4]s den Commit <a href="%[1]s">%[2]s</a> manuell in <b>%[3]s</b> gemergt`
11171115
issues.close_comment_issue=Kommentieren und schließen
11181116
issues.reopen_issue=Wieder öffnen
11191117
issues.reopen_comment_issue=Kommentieren und wieder öffnen
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums.
12071205
issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums.
12081206
issues.push_commit_1=hat %d Commit %s hinzugefügt
12091207
issues.push_commits_n=hat %d Commits %s hinzugefügt
1210-
issues.force_push_codes=`force-pushte %[1]s von <a href="%[3]s">%[2]s</a> auf <a href="%[5]s">%[4]s</a> %[6]s`
12111208
issues.due_date_form=JJJJ-MM-TT
12121209
issues.due_date_form_add=Fälligkeitsdatum hinzufügen
12131210
issues.due_date_form_edit=Bearbeiten

options/locale/locale_es-ES.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,8 +1112,6 @@ issues.context.edit=Editar
11121112
issues.context.delete=Eliminar
11131113
issues.no_content=Aún no existe contenido.
11141114
issues.close_issue=Cerrar
1115-
issues.pull_merged_at=`fusionado commit <a href="%[1]s">%[2]s</a> en <b>%[3]s</b> %[4]s`
1116-
issues.manually_pull_merged_at=`fusionado manualmente commit <a href="%[1]s">%[2]s</a> en <b>%[3]s</b> %[4]s`
11171115
issues.close_comment_issue=Comentar y cerrar
11181116
issues.reopen_issue=Reabrir
11191117
issues.reopen_comment_issue=Comentar y reabrir
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=Fallo al modificar la fecha de vencimiento.
12071205
issues.error_removing_due_date=Fallo al eliminar la fecha de vencimiento.
12081206
issues.push_commit_1=añadido %d commit %s
12091207
issues.push_commits_n=añadido %d commits %s
1210-
issues.force_push_codes=`hizo push forzado %[1]s de <a href="%[3]s">%[2]s</a> a <a href="%[5]s">%[4]s</a> %[6]s`
12111208
issues.due_date_form=aaaa-mm-dd
12121209
issues.due_date_form_add=Añadir fecha de vencimiento
12131210
issues.due_date_form_edit=Editar

options/locale/locale_fa-IR.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,6 @@ issues.context.edit=ویرایش
960960
issues.context.delete=حذف
961961
issues.no_content=هنوز محتوایی ایجاد نشده.
962962
issues.close_issue=ببند
963-
issues.pull_merged_at=`انجام ادغام تغییرات <a href="%[1]s">%[2]s</a> داخل <b>%[3]s</b> %[4]s`
964963
issues.close_comment_issue=ثبت دیدگاه و بستن
965964
issues.reopen_issue=بازگشایی
966965
issues.reopen_comment_issue=ثبت دیدگاه و بازگشایی
@@ -1046,7 +1045,6 @@ issues.error_modifying_due_date=تغییر موعد مقرر با شکست مو
10461045
issues.error_removing_due_date=حذف موعد مقرر با شکست مواجه شد.
10471046
issues.push_commit_1=%d اعمال تغییر اضافه شده است %s
10481047
issues.push_commits_n=%d اعمال تغییرات اضافه شده است %s
1049-
issues.force_push_codes=`ارسال به سرور اجباری %[1] از <a href="%[3]s">%[2]s</a> به<a href="%[5]s">%[4]s</a> %[6]s`
10501048
issues.due_date_form=yyyy-mm-dd
10511049
issues.due_date_form_add=افزودن موعد مقرر
10521050
issues.due_date_form_edit=ویرایش

options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,6 @@ issues.context.edit=Éditer
10391039
issues.context.delete=Supprimer
10401040
issues.no_content=Il n'existe pas encore de contenu.
10411041
issues.close_issue=Fermer
1042-
issues.pull_merged_at=`commit de fusion <a href="%[1]s">%[2]s</a> dans <b>%[3]s</b> %[4]s`
10431042
issues.close_comment_issue=Commenter et Fermer
10441043
issues.reopen_issue=Réouvrir
10451044
issues.reopen_comment_issue=Commenter et Réouvrir

options/locale/locale_it-IT.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,6 @@ issues.context.edit=Modifica
10531053
issues.context.delete=Elimina
10541054
issues.no_content=Non ci sono ancora contenuti.
10551055
issues.close_issue=Chiudi
1056-
issues.pull_merged_at=`merged commit <a href="%[1]s">%[2]s</a> in <b>%[3]s</b> %[4]s`
10571056
issues.close_comment_issue=Commenta e Chiudi
10581057
issues.reopen_issue=Riapri
10591058
issues.reopen_comment_issue=Commenta e Riapri
@@ -1140,7 +1139,6 @@ issues.error_modifying_due_date=Impossibile modificare la data di scadenza.
11401139
issues.error_removing_due_date=Impossibile rimuovere la data di scadenza.
11411140
issues.push_commit_1=aggiunto %d commit %s
11421141
issues.push_commits_n=aggiunto %d commit %s
1143-
issues.force_push_codes=`force-pushed %[1]s da <a href="%[3]s">%[2]s</a> a <a href="%[5]s">%[4]s</a> %[6]s`
11441142
issues.due_date_form=yyyy-mm-dd
11451143
issues.due_date_form_add=Aggiungi data di scadenza
11461144
issues.due_date_form_edit=Modifica

options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,8 +1112,6 @@ issues.context.edit=編集
11121112
issues.context.delete=削除
11131113
issues.no_content=まだ内容がありません
11141114
issues.close_issue=クローズする
1115-
issues.pull_merged_at=`がコミット <a href="%[1]s">%[2]s</a> を <b>%[3]s</b> にマージ %[4]s`
1116-
issues.manually_pull_merged_at=`がコミット <a href="%[1]s">%[2]s</a> を <b>%[3]s</b> に手動マージ %[4]s`
11171115
issues.close_comment_issue=コメントしてクローズ
11181116
issues.reopen_issue=再オープンする
11191117
issues.reopen_comment_issue=コメントして再オープン
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=期日を変更できませんでした。
12071205
issues.error_removing_due_date=期日を削除できませんでした。
12081206
issues.push_commit_1=が %d コミット追加 %s
12091207
issues.push_commits_n=が %d コミット追加 %s
1210-
issues.force_push_codes=`が %[1]s を <a href="%[3]s">%[2]s</a> から <a href="%[5]s">%[4]s</a> に強制プッシュ %[6]s`
12111208
issues.due_date_form=yyyy-mm-dd
12121209
issues.due_date_form_add=期日の追加
12131210
issues.due_date_form_edit=変更

options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,8 +1105,6 @@ issues.context.edit=Labot
11051105
issues.context.delete=Dzēst
11061106
issues.no_content=Vēl nav satura.
11071107
issues.close_issue=Aizvērt
1108-
issues.pull_merged_at=`sapludināja revīziju <a href="%[1]s">%[2]s</a> atzarā <b>%[3]s</b> %[4]s`
1109-
issues.manually_pull_merged_at=`manuāli sapludināja revīziju <a href="%[1]s">%[2]s</a> atzarā <b>%[3]s</b> %[4]s`
11101108
issues.close_comment_issue=Komentēt un aizvērt
11111109
issues.reopen_issue=Atvērt atkārtoti
11121110
issues.reopen_comment_issue=Komentēt un atvērt atkārtoti
@@ -1200,7 +1198,6 @@ issues.error_modifying_due_date=Neizdevās izmainīt izpildes termiņu.
12001198
issues.error_removing_due_date=Neizdevās noņemt izpildes termiņu.
12011199
issues.push_commit_1=iesūtīja %d revīziju %s
12021200
issues.push_commits_n=iesūtīja %d revīzijas %s
1203-
issues.force_push_codes=`veica piespiedu izmaiņu nosūtīšanu atzaram %[1]s no <a href="%[3]s">%[2]s</a> uz <a href="%[5]s">%[4]s</a> %[6]s`
12041201
issues.due_date_form=yyyy-mm-dd
12051202
issues.due_date_form_add=Pievienot izpildes termiņu
12061203
issues.due_date_form_edit=Labot

options/locale/locale_nl-NL.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,6 @@ issues.context.edit=Bewerken
10431043
issues.context.delete=Verwijder
10441044
issues.no_content=Er is nog geen inhoud.
10451045
issues.close_issue=Sluit
1046-
issues.pull_merged_at=`heeft commit <a href="%[1]s">%[2]s</a> samengevoegd in <b>%[3]s</b> %[4]s`
10471046
issues.close_comment_issue=Reageer en sluit
10481047
issues.reopen_issue=Heropen
10491048
issues.reopen_comment_issue=Heropen en geef commentaar
@@ -1130,7 +1129,6 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt.
11301129
issues.error_removing_due_date=Deadline verwijderen mislukt.
11311130
issues.push_commit_1=toegevoegd %d commit %s
11321131
issues.push_commits_n=toegevoegd %d commits %s
1133-
issues.force_push_codes=`geforceerd-pushed %[1]s van <a href="%[3]s">%[2]s</a> naar <a href="%[5]s">%[4]s</a> %[6]s`
11341132
issues.due_date_form=jjjj-mm-dd
11351133
issues.due_date_form_add=Vervaldatum toevoegen
11361134
issues.due_date_form_edit=Bewerk

options/locale/locale_pl-PL.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,6 @@ issues.context.edit=Edytuj
982982
issues.context.delete=Usuń
983983
issues.no_content=Nie ma jeszcze treści.
984984
issues.close_issue=Zamknij
985-
issues.pull_merged_at=`scalił(-a) commit <a href="%[1]s">%[2]s</a> do <b>%[3]s</b> %[4]s`
986985
issues.close_comment_issue=Skomentuj i zamknij
987986
issues.reopen_issue=Otwórz ponownie
988987
issues.reopen_comment_issue=Skomentuj i otwórz ponownie
@@ -1068,7 +1067,6 @@ issues.error_modifying_due_date=Nie udało się zmodyfikować terminu realizacji
10681067
issues.error_removing_due_date=Nie udało się usunąć terminu realizacji.
10691068
issues.push_commit_1=dodał(-a) %d commit %s
10701069
issues.push_commits_n=dodał(-a) %d commity(-ów) %s
1071-
issues.force_push_codes=`przymusowo wypchnął %[1]s z <a href="%[3]s">%[2]s</a> do <a href="%[5]s">%[4]s</a> %[6]s`
10721070
issues.due_date_form=yyyy-mm-dd
10731071
issues.due_date_form_add=Dodaj termin realizacji
10741072
issues.due_date_form_edit=Edytuj

options/locale/locale_pt-PT.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,8 +1108,6 @@ issues.context.edit=Editar
11081108
issues.context.delete=Eliminar
11091109
issues.no_content=Ainda não há conteúdo.
11101110
issues.close_issue=Fechar
1111-
issues.pull_merged_at=`cometimento <a href="%[1]s">%[2]s</a> integrado em <b>%[3]s</b> %[4]s`
1112-
issues.manually_pull_merged_at=`integrou o cometimento <a href="%[1]s"> [2] </a> em <b> [3] </b> [4] manualmente`
11131111
issues.close_comment_issue=Comentar e fechar
11141112
issues.reopen_issue=Reabrir
11151113
issues.reopen_comment_issue=Comentar e reabrir
@@ -1203,7 +1201,6 @@ issues.error_modifying_due_date=Falha ao modificar a data limite.
12031201
issues.error_removing_due_date=Falha ao remover a data limite.
12041202
issues.push_commit_1=adicionou %d cometimento %s
12051203
issues.push_commits_n=adicionou %d cometimentos %s
1206-
issues.force_push_codes=`forçou o envio de %[1]s de <a href="%[3]s">%[2]s</a> para <a href="%[5]s">%[4]s</a> %[6]s`
12071204
issues.due_date_form=yyyy-mm-dd
12081205
issues.due_date_form_add=Adicionar data limite
12091206
issues.due_date_form_edit=Editar

options/locale/locale_ru-RU.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,8 +1107,6 @@ issues.context.edit=Редактировать
11071107
issues.context.delete=Удалить
11081108
issues.no_content=Пока нет содержимого.
11091109
issues.close_issue=Закрыть
1110-
issues.pull_merged_at=`Объединил коммит <a href="%[1]s">%[2]s</a> на <b>%[3]s</b> %[4]s`
1111-
issues.manually_pull_merged_at=`Объединил коммит <a href="%[1]s">%[2]s</a> с <b>%[3]s</b> %[4]s вручную`
11121110
issues.close_comment_issue=Прокомментировать и закрыть
11131111
issues.reopen_issue=Открыть снова
11141112
issues.reopen_comment_issue=Прокомментировать и открыть снова
@@ -1202,7 +1200,6 @@ issues.error_modifying_due_date=Не удалось изменить срок в
12021200
issues.error_removing_due_date=Не удалось убрать срок выполнения.
12031201
issues.push_commit_1=добавил(а) %d коммит %s
12041202
issues.push_commits_n=добавил(а) %d коммитов %s
1205-
issues.force_push_codes=`Принудительный push %[1]s ветки из <a href="%[3]s">%[2]s</a> to <a href="%[5]s">%[4]s</a>. %[6]s`
12061203
issues.due_date_form=гггг-мм-дд
12071204
issues.due_date_form_add=Добавить срок выполнения
12081205
issues.due_date_form_edit=Редактировать

options/locale/locale_sv-SE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,6 @@ issues.context.edit=Redigera
10041004
issues.context.delete=Ta bort
10051005
issues.no_content=Det finns inget innehåll än.
10061006
issues.close_issue=Stäng
1007-
issues.pull_merged_at=`sammanfogade commit <a href="%[1]s">%[2]s</a> in i <b>%[3]s</b> %[4]s`
10081007
issues.close_comment_issue=Kommentera och stäng
10091008
issues.reopen_issue=Återöppna
10101009
issues.reopen_comment_issue=Kommentera och återöppna

options/locale/locale_tr-TR.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,8 +1107,6 @@ issues.context.edit=Düzenle
11071107
issues.context.delete=Sil
11081108
issues.no_content=Henüz bir içerik yok.
11091109
issues.close_issue=Kapat
1110-
issues.pull_merged_at=`<a href="%[1]s">%[2]s</a> işlemesini <b>%[3]s</b> ile %[4]s birleştirdi`
1111-
issues.manually_pull_merged_at=`<a href="%[1]s">%[2]s</a> işlemesini <b>%[3]s</b> %[4]s elle birleştirdi`
11121110
issues.close_comment_issue=Yorum Yap ve Kapat
11131111
issues.reopen_issue=Yeniden aç
11141112
issues.reopen_comment_issue=Yorum Yap ve Yeniden Aç
@@ -1202,7 +1200,6 @@ issues.error_modifying_due_date=Bitiş tarihi değiştirilemedi.
12021200
issues.error_removing_due_date=Bitiş tarihi silinemedi.
12031201
issues.push_commit_1=%d işlemeyi %s ekledi
12041202
issues.push_commits_n=%d işlemeyi %s ekledi
1205-
issues.force_push_codes=`%[1]s <a href="%[3]s">%[2]s</a> konumundan <a href="%[5]s">%[4]s</a> %[6]s konumuna zorla güncellendi`
12061203
issues.due_date_form=yyyy-aa-gg
12071204
issues.due_date_form_add=Bitiş tarihi ekle
12081205
issues.due_date_form_edit=Düzenle

0 commit comments

Comments
 (0)