Merge branch 'master' of github.com:go-gitea/gitea

Author: guillep2k

docs/content/doc/advanced/external-renderers.en-us.md

@@ -28,13 +28,13 @@ In order to get file rendering through external binaries, their associated packa
 If you're using a Docker image, your `Dockerfile` should contain something along this lines:
 
 ```
-FROM gitea/gitea:1.6.0
+FROM gitea/gitea:{{< version >}}
 [...]
 
 COPY custom/app.ini /data/gitea/conf/app.ini
 [...]
 
-RUN apk --no-cache add asciidoctor freetype freetype-dev gcc g++ libpng python-dev py-pip python3-dev py3-pip
+RUN apk --no-cache add asciidoctor freetype freetype-dev gcc g++ libpng python-dev py-pip python3-dev py3-pip py3-zmq
 # install any other package you need for your external renderers
 
 RUN pip3 install --upgrade pip

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/go-redis/redis v6.15.2+incompatible
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/go-swagger/go-swagger v0.20.1
-	github.com/go-xorm/xorm v0.7.8-0.20190924080535-59ed80ce1a67
+	github.com/go-xorm/xorm v0.7.8-0.20190925172902-71947cf034b6
 	github.com/gobwas/glob v0.2.3
 	github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
 	github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14

go.sum

@@ -250,8 +250,8 @@ github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.m
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-xorm/xorm v0.7.6/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls=
-github.com/go-xorm/xorm v0.7.8-0.20190924080535-59ed80ce1a67 h1:mB5RWONyATkQ48+iQZ1lCZNPG3tABilyaEOxDm1QWyU=
-github.com/go-xorm/xorm v0.7.8-0.20190924080535-59ed80ce1a67/go.mod h1:RSsmsVARCy4sayuKWFPaVNQMPYGLNRIK71YIVvgImL0=
+github.com/go-xorm/xorm v0.7.8-0.20190925172902-71947cf034b6 h1:kwKsKxuD8cUIOHWaMk5nuBU9ZUTnGpN2c/e4Mt6RTAo=
+github.com/go-xorm/xorm v0.7.8-0.20190925172902-71947cf034b6/go.mod h1:RSsmsVARCy4sayuKWFPaVNQMPYGLNRIK71YIVvgImL0=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=

models/action_test.go

@@ -173,7 +173,7 @@ func TestPushCommits_AvatarLink(t *testing.T) {
 	pushCommits.Len = len(pushCommits.Commits)
 
 	assert.Equal(t,
-		"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon",
+		"/suburl/user/avatar/user2/-1",
 		pushCommits.AvatarLink("[email protected]"))
 
 	assert.Equal(t,

models/user.go

@@ -17,6 +17,7 @@ import (
 	"image/png"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 	"unicode/utf8"
@@ -374,9 +375,20 @@ func (u *User) generateRandomAvatar(e Engine) error {
 	return nil
 }
 
-// SizedRelAvatarLink returns a relative link to the user's avatar. When
-// applicable, the link is for an avatar of the indicated size (in pixels).
+// SizedRelAvatarLink returns a link to the user's avatar via
+// the local explore page. Function returns immediately.
+// When applicable, the link is for an avatar of the indicated size (in pixels).
 func (u *User) SizedRelAvatarLink(size int) string {
+	return strings.TrimRight(setting.AppSubURL, "/") + "/user/avatar/" + u.Name + "/" + strconv.Itoa(size)
+}
+
+// RealSizedAvatarLink returns a link to the user's avatar. When
+// applicable, the link is for an avatar of the indicated size (in pixels).
+//
+// This function make take time to return when federated avatars
+// are in use, due to a DNS lookup need
+//
+func (u *User) RealSizedAvatarLink(size int) string {
 	if u.ID == -1 {
 		return base.DefaultAvatarLink()
 	}

options/locale/TRANSLATORS

@@ -1,6 +1,7 @@
 # This file lists all PUBLIC individuals having contributed content to the translation.
 # Entries are in alphabetical order.
 
+Adam Jurkiewicz <a DOT jurkiewicz5 AT gmail DOT com>
 Adam Strzelecki <ono AT java DOT pl>
 Adrian Verde <me AT adrianverde DOT com>
 Akihiro YAGASAKI <yaggytter AT momiage DOT com>

options/locale/locale_zh-CN.ini

@@ -318,6 +318,7 @@ enterred_invalid_repo_name=输入的仓库名称不正确
 enterred_invalid_owner_name=新的所有者名称无效。
 enterred_invalid_password=输入的密码不正确
 user_not_exist=该用户名不存在
+team_not_exist=团队不存在
 last_org_owner=您不能从 "所有者" 团队中删除最后一个用户。在任何给定的团队中必须至少有一个所有者。
 cannot_add_org_to_team=组织不能被加入到团队中。
 
@@ -1135,6 +1136,7 @@ settings.collaboration=协作者
 settings.collaboration.admin=管理员
 settings.collaboration.write=可写权限
 settings.collaboration.read=可读权限
+settings.collaboration.owner=所有者
 settings.collaboration.undefined=未定义
 settings.hooks=管理 Web 钩子
 settings.githooks=管理 Git 钩子
@@ -1216,6 +1218,11 @@ settings.collaborator_deletion_desc=删除协作者后他将无法再对此仓
 settings.remove_collaborator_success=协作者删除成功！
 settings.search_user_placeholder=搜索用户...
 settings.org_not_allowed_to_be_collaborator=组织不允许被添加为仓库协作者！
+settings.change_team_access_not_allowed=更改仓库的团队访问权限仅限于组织所有者
+settings.team_not_in_organization=团队不在与仓库相同的组织中
+settings.add_team_duplicate=团队已经拥有仓库
+settings.add_team_success=团队现在可以访问仓库。
+settings.remove_team_success=团队访问仓库的权限已被删除。
 settings.add_webhook=添加 Web 钩子
 settings.add_webhook.invalid_channel_name=Webhook 通道名称不能为空且不能仅包含一个 # 字符。
 settings.hooks_desc=当Gitea事件发生时，Web钩子自动发出HTTP POST请求。在 <a target="_blank" rel="noopener noreferrer" href="%s"> 指南</a> 中阅读更多内容。
@@ -1474,6 +1481,8 @@ settings.options=组织
 settings.full_name=组织全名
 settings.website=官方网站
 settings.location=所在地区
+settings.permission=权限
+settings.repoadminchangeteam=仓库管理员可以添加或移除团队的访问权限
 settings.visibility=可见性
 settings.visibility.public=公开
 settings.visibility.limited=受限 (仅对登录用户可见)
@@ -1871,7 +1880,7 @@ monitor.name=任务名称
 monitor.schedule=任务安排
 monitor.next=下次执行时间
 monitor.previous=上次执行时间
-monitor.execute_times=执行时长
+monitor.execute_times=执行次数
 monitor.process=运行中进程
 monitor.desc=进程描述
 monitor.start=开始时间

routers/routes/routes.go

@@ -404,6 +404,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
 		m.Any("/activate", user.Activate, reqSignIn)
 		m.Any("/activate_email", user.ActivateEmail)
+		m.Get("/avatar/:username/:size", user.Avatar)
 		m.Get("/email2user", user.Email2User)
 		m.Get("/recover_account", user.ResetPasswd)
 		m.Post("/recover_account", user.ResetPasswdPost)

routers/user/avatar.go

@@ -0,0 +1,37 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package user
+
+import (
+	"strconv"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+)
+
+// Avatar redirect browser to user avatar of requested size
+func Avatar(ctx *context.Context) {
+	userName := ctx.Params(":username")
+	size, err := strconv.Atoi(ctx.Params(":size"))
+	if err != nil {
+		ctx.ServerError("Invalid avatar size", err)
+		return
+	}
+
+	log.Debug("Asked avatar for user %v and size %v", userName, size)
+
+	user, err := models.GetUserByName(userName)
+	if err != nil {
+		if models.IsErrUserNotExist(err) {
+			ctx.ServerError("Requested avatar for invalid user", err)
+		} else {
+			ctx.ServerError("Retrieving user by name", err)
+		}
+		return
+	}
+
+	ctx.Redirect(user.RealSizedAvatarLink(size))
+}

vendor/github.com/go-xorm/xorm/dialect_mssql.go

@@ -198,7 +198,7 @@ github.com/go-swagger/go-swagger/cmd/swagger/commands/initcmd
 github.com/go-swagger/go-swagger/codescan
 github.com/go-swagger/go-swagger/generator
 github.com/go-swagger/go-swagger/scan
-# github.com/go-xorm/xorm v0.7.8-0.20190924080535-59ed80ce1a67
+# github.com/go-xorm/xorm v0.7.8-0.20190925172902-71947cf034b6
 github.com/go-xorm/xorm
 # github.com/gobwas/glob v0.2.3
 github.com/gobwas/glob