Merge branch 'master' into rebase-merge-commit

Author: lunny

CHANGELOG.md

@@ -4,6 +4,16 @@ 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.6.1](https://github.com/go-gitea/gitea/releases/tag/v1.6.1) - 2018-12-08
+* BUGFIXES
+  * Fix dependent issue searching when gitea is run in subpath (#5392) (#5400)
+  * API: '/orgs/:org/repos': return private repos with read access (#5393)
+  * Fix repository deletion when there is large number of issues in it (#5426) (#5434)
+  * Word-break the WebHook url to prevent a ui-break (#5445)
+  * Admin should be able to delete repos via the API even if they are not a member of the organization (#5443) (#5447)
+  * Ensure that the `closed_at` is set for closed (#5450)
+  * Fix topic name length on database (#5493) (#5495)
+
 ## [1.6.0](https://github.com/go-gitea/gitea/releases/tag/v1.6.0) - 2018-11-22
 * BREAKING
   * Respect email privacy option in user search via API (#4512)

models/repo.go

@@ -1771,6 +1771,7 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
 		&RepoRedirect{RedirectRepoID: repoID},
 		&Webhook{RepoID: repoID},
 		&HookTask{RepoID: repoID},
+		&Notification{RepoID: repoID},
 	); err != nil {
 		return fmt.Errorf("deleteBeans: %v", err)
 	}

models/review.go

@@ -9,6 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/util"
+	"github.com/go-xorm/core"
 	"github.com/go-xorm/xorm"
 
 	"github.com/go-xorm/builder"
@@ -266,13 +267,24 @@ type PullReviewersWithType struct {
 // GetReviewersByPullID gets all reviewers for a pull request with the statuses
 func GetReviewersByPullID(pullID int64) (issueReviewers []*PullReviewersWithType, err error) {
 	irs := []*PullReviewersWithType{}
-	err = x.Select("`user`.*, review.type, max(review.updated_unix) as review_updated_unix").
-		Table("review").
-		Join("INNER", "`user`", "review.reviewer_id = `user`.id").
-		Where("review.issue_id = ? AND (review.type = ? OR review.type = ?)", pullID, ReviewTypeApprove, ReviewTypeReject).
-		GroupBy("`user`.id, review.type").
-		OrderBy("review_updated_unix DESC").
-		Find(&irs)
+	if x.Dialect().DBType() == core.MSSQL {
+		err = x.SQL(`SELECT [user].*, review.type, review.review_updated_unix FROM 
+(SELECT review.id, review.type, review.reviewer_id, max(review.updated_unix) as review_updated_unix 
+FROM review WHERE review.issue_id=? AND (review.type = ? OR review.type = ?) 
+GROUP BY review.id, review.type, review.reviewer_id) as review 
+INNER JOIN [user] ON review.reviewer_id = [user].id ORDER BY review_updated_unix DESC`,
+			pullID, ReviewTypeApprove, ReviewTypeReject).
+			Find(&irs)
+	} else {
+		err = x.Select("`user`.*, review.type, max(review.updated_unix) as review_updated_unix").
+			Table("review").
+			Join("INNER", "`user`", "review.reviewer_id = `user`.id").
+			Where("review.issue_id = ? AND (review.type = ? OR review.type = ?)",
+				pullID, ReviewTypeApprove, ReviewTypeReject).
+			GroupBy("`user`.id, review.type").
+			OrderBy("review_updated_unix DESC").
+			Find(&irs)
+	}
 
 	// We need to group our results by user id _and_ review type, otherwise the query fails when using postgresql.
 	// But becaus we're doing this, we need to manually filter out multiple reviews of different types by the

options/locale/locale_ja-JP.ini

@@ -1327,6 +1327,7 @@ teams.add_team_repository=チームのリポジトリを追加
 teams.remove_repo=削除
 teams.add_nonexistent_repo=追加しようとしているリポジトリは存在しません。 先にリポジトリを作成してください。
 teams.add_duplicate_users=ユーザーは既にチームのメンバーです。
+teams.members.none=このチームにはメンバーがいません。
 
 [admin]
 dashboard=ダッシュボード

options/locale/locale_lv-LV.ini

@@ -242,6 +242,7 @@ openid_register_title=Izveidot jaunu kontu
 openid_register_desc=Izvēlētais OpenID konts sistēmā netika atpazīts, bet Jūs to varat piesaistīt esošam kontam.
 openid_signin_desc=Ievadiet savu OpenID URI, piemēram: https://anna.me, peteris.openid.org.lv, gnusocial.net/janis.
 disable_forgot_password_mail=Paroles atjaunošana nav pieejama. Sazinieties ar sistēmas administratoru.
+email_domain_blacklisted=Nav atļauts reģistrēties ar šādu e-pasta adresi.
 
 [mail]
 activate_account=Lūdzu, aktivizējiet savu kontu
@@ -524,6 +525,7 @@ create_repo=Izveidot repozitoriju
 default_branch=Noklusējuma atzars
 mirror_prune=Izmest
 mirror_prune_desc=Izdzēst visas ārējās atsauces, kas ārējā repozitorijā vairs neeksistē
+mirror_interval=Spoguļošanas biežums (atļautās laika vienības 'h', 'm' un 's'). Ievadiet 0, lai atslēgtu automātisko spoguļošanu.
 mirror_interval_invalid=Nekorekts spoguļošanas intervāls.
 mirror_address=Spoguļa adrese
 mirror_address_desc=Lūdzu iekļaujiet adresē, ja nepieciešams, arī lietotājvārdu un paroli.
@@ -830,6 +832,7 @@ issues.review.content.empty=Nepieciešams norādīt komentāru par prasītajām
 issues.review.reject=noraidīja šīs izmaiņas %s
 issues.review.pending=Nav iesūtīts
 issues.review.review=Recenzija
+issues.review.reviewers=Recenzenti
 issues.review.show_outdated=Rādīt novecojušu
 issues.review.hide_outdated=Paslēpt novecojušu
 
@@ -876,6 +879,7 @@ milestones.no_due_date=Bez termiņa
 milestones.open=Atvērta
 milestones.close=Aizvērt
 milestones.new_subheader=Atskaites punkti, ļauj organizēt problēmas un sekot to progresam.
+milestones.completeness=%d%% pabeigti
 milestones.create=Izveidot atskaites punktu
 milestones.title=Virsraksts
 milestones.desc=Apraksts
@@ -1323,6 +1327,8 @@ teams.add_team_repository=Pievienot komandas repozitoriju
 teams.remove_repo=Noņemt
 teams.add_nonexistent_repo=Repozitorijs, kuram Jūs mēģinat pievienot neeksistē, sākumā izveidojiet to.
 teams.add_duplicate_users=Lietotājs jau ir šajā komandā.
+teams.repos.none=Šai komandai nav piekļuves nevienam repozitorijam.
+teams.members.none=Šajā komandā nav pievienots neviens lietotājs.
 
 [admin]
 dashboard=Infopanelis

options/locale/locale_pt-BR.ini

@@ -1327,6 +1327,8 @@ teams.add_team_repository=Adicionar repositório da equipe
 teams.remove_repo=Remover
 teams.add_nonexistent_repo=O repositório que você está tentando adicionar não existe, por favor, crie-o primeiro.
 teams.add_duplicate_users=Usuário já é um membro da equipe.
+teams.repos.none=Nenhum repositório pode ser acessado por essa equipe.
+teams.members.none=Nenhum membro nesta equipe.
 
 [admin]
 dashboard=Painel

routers/repo/wiki.go

@@ -74,7 +74,6 @@ func findWikiRepoCommit(ctx *context.Context) (*git.Repository, *git.Commit, err
 
 	commit, err := wikiRepo.GetBranchCommit("master")
 	if err != nil {
-		ctx.ServerError("GetBranchCommit", err)
 		return wikiRepo, nil, err
 	}
 	return wikiRepo, commit, nil
@@ -112,6 +111,9 @@ func wikiContentsByName(ctx *context.Context, commit *git.Commit, wikiName strin
 func renderWikiPage(ctx *context.Context, isViewPage bool) (*git.Repository, *git.TreeEntry) {
 	wikiRepo, commit, err := findWikiRepoCommit(ctx)
 	if err != nil {
+		if !git.IsErrNotExist(err) {
+			ctx.ServerError("GetBranchCommit", err)
+		}
 		return nil, nil
 	}