Merge branch 'master' into assets_dir

Author: a1012112796

.editorconfig

@@ -12,6 +12,12 @@ insert_final_newline = true
 [*.{go,tmpl,html}]
 indent_style = tab
 
+[templates/custom/*.tmpl]
+insert_final_newline = false
+
+[templates/swagger/v1_json.tmpl]
+indent_style = space
+
 [Makefile]
 indent_style = tab
 

CHANGELOG.md

@@ -4,26 +4,17 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
-## [1.14.0-RC2](https://github.com/go-gitea/gitea/releases/tag/v1.14.0-rc2) - 2021-03-22
-
-* SECURITY
-  * Fix bug on avatar middleware (#15124) (#15125)
-  * Fix another clusterfuzz identified issue (#15096) (#15113)
-  * Update to goldmark 1.3.3 (#15059) (#15060)
-* BUGFIXES
-  * Fix the v176 migration (#15110) (#15111)
-  * Fix double 'push tag' action feed (#15078) (#15083)
-  * Remove possible resource leak (#15067) (#15082)
-  * Handle unauthorized user events gracefully (#15071) (#15074)
-
-## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0-rc1) - 2021-03-19
+## [1.14.0](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-04-11
 
 * SECURITY
   * Respect approved email domain list for externally validated user registration (#15014)
   * Add reverse proxy configuration support for remote IP address detection (#14959)
   * Ensure validation occurs on clone addresses too (#14994)
   * Fix several render issues highlighted during fuzzing (#14986)
 * BREAKING
+  * Fix double 'push tag' action feed (#15078) (#15083)
+  * Remove possible resource leak (#15067) (#15082)
+  * Handle unauthorized user events gracefully (#15071) (#15074)
   * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
   * Migrate from Macaron to Chi framework (#14293)
   * Deprecate building for mips (#14174)
@@ -54,6 +45,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244)
   * Create Rootless Docker image (#10154)
 * API
+  * Speedup issue search (#15179) (#15192)
   * Get pull, return head branch sha, even if deleted (#14931)
   * Export LFS & TimeTracking function status (#14753)
   * Show Gitea version in swagger (#14654)
@@ -78,6 +70,20 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add more filters to issues search (#13514)
   * Add review request api (#11355)
 * BUGFIXES
+  * Fix delete nonexist oauth application 500 and prevent deadlock (#15384) (#15396)
+  * Always set the merge base used to merge the commit (#15352) (#15385)
+  * Upgrade to bluemonday 1.0.7 (#15379) (#15380)
+  * Turn RepoRef and RepoAssignment back into func(*Context) (#15372) (#15377)
+  * Move FCGI req.URL.Path fix-up to the FCGI listener (#15292) (#15361)
+  * Show diff on rename with diff changes (#15338) (#15339)
+  * Fix handling of logout event (#15323) (#15337)
+  * Fix CanCreateRepo check (#15311) (#15321)
+  * Fix xorm log stack level (#15285) (#15316)
+  * Fix bug in Wrap (#15302) (#15309)
+  * Drop the event source if we are unauthorized (#15275) (#15280)
+  * Backport Fix graph pagination (#15225)  (#15249)
+  * Prevent NPE in CommentMustAsDiff if no hunk header (#15199) (#15200)
+  * should run RetrieveRepoMetas() for empty pr (#15187) (#15190)
   * Move setting to enable closing issue via commit in non default branch to repo settings (#14965)
   * Show correct issues for team dashboard (#14952)
   * 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).
   * Use GO variable in go-check target (#13146) (#13147)
 * ENHANCEMENTS
   * UI style improvements
+  * Dropzone styling improvements (#15291) (#15374)
+  * Add size to Save function (#15264) (#15270)
+  * Monaco improvements (#15333) (#15345)
   * Support .mailmap in code activity stats (#15009)
   * Sort release attachments by name (#15008)  
   * Add ui.explore settings to control view of explore pages (#14094)

Makefile

@@ -325,6 +325,7 @@ lint: lint-frontend lint-backend
 lint-frontend: node_modules
 	npx eslint --color --max-warnings=0 web_src/js build templates *.config.js
 	npx stylelint --color --max-warnings=0 web_src/less
+	npx editorconfig-checker templates
 
 .PHONY: lint-backend
 lint-backend: golangci-lint revive vet

docs/config.yaml

@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.13.7
+  version: 1.14.0
   minGoVersion: 1.14
   goVersion: 1.16
   minNodeVersion: 12.17

modules/git/blob_test.go

@@ -7,39 +7,23 @@ package git
 
 import (
 	"io/ioutil"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestBlob_Data(t *testing.T) {
-	output := `Copyright (c) 2016 The Gitea Authors
-Copyright (c) 2015 The Gogs Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-`
-	repo, err := OpenRepository("../../.git")
-	assert.NoError(t, err)
+	output := "file2\n"
+	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+	repo, err := OpenRepository(bareRepo1Path)
+	if !assert.NoError(t, err) {
+		t.Fatal()
+	}
 	defer repo.Close()
 
-	testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
+	testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
 	assert.NoError(t, err)
 
 	r, err := testBlob.DataAsync()
@@ -53,13 +37,14 @@ THE SOFTWARE.
 }
 
 func Benchmark_Blob_Data(b *testing.B) {
-	repo, err := OpenRepository("../../.git")
+	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+	repo, err := OpenRepository(bareRepo1Path)
 	if err != nil {
 		b.Fatal(err)
 	}
 	defer repo.Close()
 
-	testBlob, err := repo.GetBlob("a8d4b49dd073a4a38a7e58385eeff7cc52568697")
+	testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
 	if err != nil {
 		b.Fatal(err)
 	}

options/locale/locale_cs-CZ.ini

@@ -1096,7 +1096,6 @@ issues.context.edit=Upravit
 issues.context.delete=Smazat
 issues.no_content=Není zde žádný obsah.
 issues.close_issue=Zavřít
-issues.pull_merged_at=`sloučil(a) revizi <a href="%[1]s">%[2]s</a> do <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Okomentovat a zavřít
 issues.reopen_issue=Znovuotevřít
 issues.reopen_comment_issue=Okomentovat a znovuotevřít
@@ -1187,7 +1186,6 @@ issues.error_modifying_due_date=Změna termínu dokončení selhala.
 issues.error_removing_due_date=Odstranění termínu dokončení selhalo.
 issues.push_commit_1=přidal(a) %d revizi %s
 issues.push_commits_n=přidal(a) %d revize %s
-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`
 issues.due_date_form=rrrr-mm-dd
 issues.due_date_form_add=Přidat termín dokončení
 issues.due_date_form_edit=Upravit

options/locale/locale_de-DE.ini

@@ -1112,8 +1112,6 @@ issues.context.edit=Bearbeiten
 issues.context.delete=Löschen
 issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt.
 issues.close_issue=Schließen
-issues.pull_merged_at=`hat den Commit <a href="%[1]s">%[2]s</a> in <b>%[3]s</b> %[4]s gemergt`
-issues.manually_pull_merged_at=`hat %[4]s den Commit <a href="%[1]s">%[2]s</a> manuell in <b>%[3]s</b> gemergt`
 issues.close_comment_issue=Kommentieren und schließen
 issues.reopen_issue=Wieder öffnen
 issues.reopen_comment_issue=Kommentieren und wieder öffnen
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums.
 issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums.
 issues.push_commit_1=hat %d Commit %s hinzugefügt
 issues.push_commits_n=hat %d Commits %s hinzugefügt
-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`
 issues.due_date_form=JJJJ-MM-TT
 issues.due_date_form_add=Fälligkeitsdatum hinzufügen
 issues.due_date_form_edit=Bearbeiten

options/locale/locale_es-ES.ini

@@ -1112,8 +1112,6 @@ issues.context.edit=Editar
 issues.context.delete=Eliminar
 issues.no_content=Aún no existe contenido.
 issues.close_issue=Cerrar
-issues.pull_merged_at=`fusionado commit <a href="%[1]s">%[2]s</a> en <b>%[3]s</b> %[4]s`
-issues.manually_pull_merged_at=`fusionado manualmente commit <a href="%[1]s">%[2]s</a> en <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Comentar y cerrar
 issues.reopen_issue=Reabrir
 issues.reopen_comment_issue=Comentar y reabrir
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=Fallo al modificar la fecha de vencimiento.
 issues.error_removing_due_date=Fallo al eliminar la fecha de vencimiento.
 issues.push_commit_1=añadido %d commit %s
 issues.push_commits_n=añadido %d commits %s
-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`
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Añadir fecha de vencimiento
 issues.due_date_form_edit=Editar

options/locale/locale_fa-IR.ini

@@ -960,7 +960,6 @@ issues.context.edit=ویرایش
 issues.context.delete=حذف
 issues.no_content=هنوز محتوایی ایجاد نشده.
 issues.close_issue=ببند
-issues.pull_merged_at=`انجام ادغام تغییرات <a href="%[1]s">%[2]s</a> داخل <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=ثبت دیدگاه و بستن
 issues.reopen_issue=بازگشایی
 issues.reopen_comment_issue=ثبت دیدگاه و بازگشایی
@@ -1046,7 +1045,6 @@ issues.error_modifying_due_date=تغییر موعد مقرر با شکست مو
 issues.error_removing_due_date=حذف موعد مقرر با شکست مواجه شد.
 issues.push_commit_1=%d اعمال تغییر اضافه شده است %s
 issues.push_commits_n=%d اعمال تغییرات اضافه شده است %s
-issues.force_push_codes=`ارسال به سرور اجباری %[1] از  <a href="%[3]s">%[2]s</a> به<a href="%[5]s">%[4]s</a> %[6]s`
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=افزودن موعد مقرر
 issues.due_date_form_edit=ویرایش

options/locale/locale_fr-FR.ini

@@ -1039,7 +1039,6 @@ issues.context.edit=Éditer
 issues.context.delete=Supprimer
 issues.no_content=Il n'existe pas encore de contenu.
 issues.close_issue=Fermer
-issues.pull_merged_at=`commit de fusion <a href="%[1]s">%[2]s</a> dans <b>%[3]s</b> %[4]s`
 issues.close_comment_issue=Commenter et Fermer
 issues.reopen_issue=Réouvrir
 issues.reopen_comment_issue=Commenter et Réouvrir