Update locales

- Refactor code to use sync.UniqueQueue
- Closes #3509

.bra.toml

@@ -1,6 +1,6 @@
 [run]
 init_cmds = [
-	["make", "build-dev", "TAGS=sqlite"],
+	["make", "build-dev"],
 	["./gogs", "web"]
 ]
 watch_all = true
@@ -14,6 +14,6 @@ watch_exts = [".go"]
 ignore_files = [".+_test.go"]
 build_delay = 1500
 cmds = [
-	["make", "build-dev", "TAGS=sqlite"], # cert pam tidb
+	["make", "build-dev"], # TAGS=sqlite cert pam tidb
 	["./gogs", "web"]
 ]

.codebeatignore

@@ -1,6 +1,7 @@
 conf/**
 docker/**
-public/**
+modules/bindata/**
 packager/**
+public/**
 scripts/**
 templates/**

.editorconfig

@@ -5,8 +5,21 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.yml]
+[*.go]
+indent_style = tab
+indent_size = 4
+
+[*.tmpl]
+indent_style = tab
+indent_size = 2
+
+[*.{less,yml}]
 indent_style = space
 indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 4

.gopmfile

@@ -3,7 +3,7 @@ path = github.com/gogits/gogs
 
 [deps]
 github.com/bradfitz/gomemcache = commit:fb1f79c
-github.com/codegangsta/cli = commit:1efa31f
+github.com/urfave/cli = commit:1efa31f
 github.com/go-macaron/binding = commit:9440f33
 github.com/go-macaron/cache = commit:5617353
 github.com/go-macaron/captcha = commit:8aa5919
@@ -18,8 +18,8 @@ github.com/go-xorm/core = commit:5bf745d
 github.com/go-xorm/xorm = commit:c6c7056
 github.com/gogits/chardet = commit:2404f77
 github.com/gogits/cron = commit:7f3990a
-github.com/gogits/git-module = commit:18dd87d
-github.com/gogits/go-gogs-client = commit:d1020b4
+github.com/gogits/git-module = commit:5e0c133
+github.com/gogits/go-gogs-client = commit:c52f7ee
 github.com/issue9/identicon = commit:d36b545
 github.com/jaytaylor/html2text = commit:52d9b78
 github.com/kardianos/minwinsvc = commit:cad6b2b
@@ -48,6 +48,7 @@ golang.org/x/text = commit:2910a50
 gopkg.in/alexcesaro/quotedprintable.v3 = commit:2caba25
 gopkg.in/asn1-ber.v1 = commit:4e86f43
 gopkg.in/bufio.v1 = commit:567b2bf
+gopkg.in/editorconfig/editorconfig-core-go.v1 = commit:a872f05
 gopkg.in/gomail.v2 = commit:81ebce5
 gopkg.in/ini.v1 = commit:cf53f92
 gopkg.in/ldap.v2 = commit:d0a5ced
@@ -56,4 +57,3 @@ gopkg.in/redis.v2 = commit:e617904
 
 [res]
 include = public|scripts|templates
-

.mailmap

@@ -0,0 +1,2 @@
+Unknwon <u@gogs.io> <joe2010xtmf@163.com>
+Unknwon <u@gogs.io> 无闻 <u@gogs.io>

.travis.yml

@@ -4,6 +4,7 @@ go:
   - 1.4
   - 1.5
   - 1.6
+  - 1.7
 
 before_install:
   - sudo apt-get update -qq

Makefile

@@ -17,8 +17,14 @@ GOVET = go tool vet -composites=false -methods=false -structtags=false
 
 .IGNORE: public/css/gogs.css
 
+all: build
+
+check: test
+
+dist: release
+
 govet:
-	$(GOVET) gogs.go 
+	$(GOVET) gogs.go
 	$(GOVET) models modules routers
 
 build: $(GENERATED)

README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current tip version: 0.9.71 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.97 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
@@ -41,10 +41,12 @@ The goal of this project is to make the easiest, fastest, and most painless way
 - SMTP/LDAP/Reverse proxy authentication
 - Reverse proxy with sub-path
 - Account/Organization/Repository management
+- Add/Remove repository collaborators
 - Repository/Organization webhooks (including Slack)
 - Repository Git hooks/deploy keys
 - Repository issues, pull requests and wiki
-- Add/Remove repository collaborators
+- Migrate and mirror repository and its wiki
+- Web editor for repository files and wiki
 - Gravatar and Federated avatar with custom source
 - Mail service
 - Administration panel
@@ -120,7 +122,7 @@ There are 5 ways to install Gogs:
 
 - Router and middleware mechanism of [Macaron](https://github.com/go-macaron/macaron).
 - System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
-- Thanks [lavachen](http://www.lavachen.cn/) and [Rocker](http://weibo.com/rocker1989) for designing Logo.
+- Thanks [Rocker](http://weibo.com/rocker1989) for designing Logo.
 - Thanks [Crowdin](https://crowdin.com/project/gogs) for providing open source translation plan.
 - Thanks [DigitalOcean](https://www.digitalocean.com) for hosting home and demo sites.
 - Thanks [KeyCDN](https://www.keycdn.com/) and [QiNiu](http://www.qiniu.com/) for providing CDN service.

README_ZH.md

@@ -22,10 +22,12 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - 支持 SMTP、LDAP 和反向代理的用户认证
 - 支持反向代理子路径
 - 支持用户、组织和仓库管理系统
+- 支持添加和删除仓库协作者
 - 支持仓库和组织级别 Web 钩子（包括 Slack 集成）
 - 支持仓库 Git 钩子和部署密钥
 - 支持仓库工单（Issue）、合并请求（Pull Request）以及 Wiki
-- 支持添加和删除仓库协作者
+- 支持迁移和镜像仓库以及它的 Wiki
+- 支持在线编辑仓库文件和 Wiki
 - 支持自定义源的 Gravatar 和 Federated Avatar
 - 支持邮件服务
 - 支持后台管理面板
@@ -89,7 +91,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 
 - 基于 [Macaron](https://github.com/go-macaron/macaron) 的路由与中间件机制。
 - 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。
-- 感谢 [lavachen](http://www.lavachen.cn/) 和 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。
+- 感谢 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。
 - 感谢 [Crowdin](https://crowdin.com/project/gogs) 提供免费的开源项目本地化支持。
 - 感谢 [DigitalOcean](https://www.digitalocean.com) 提供主站和体验站点的服务器赞助。
 - 感谢 [KeyCDN](https://www.keycdn.com/) 和 [七牛云存储](http://www.qiniu.com/) 提供 CDN 服务赞助。

cmd/admin.go

@@ -0,0 +1,70 @@
+// Copyright 2016 The Gogs 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 cmd
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/setting"
+)
+
+var (
+	CmdAdmin = cli.Command{
+		Name:  "admin",
+		Usage: "Preform admin operations on command line",
+		Description: `Allow using internal logic of Gogs without hacking into the source code
+to make automatic initialization process more smoothly`,
+		Subcommands: []cli.Command{
+			subcmdCreateUser,
+		},
+	}
+
+	subcmdCreateUser = cli.Command{
+		Name:   "create-user",
+		Usage:  "Create a new user in database",
+		Action: runCreateUser,
+		Flags: []cli.Flag{
+			stringFlag("name", "", "Username"),
+			stringFlag("password", "", "User password"),
+			stringFlag("email", "", "User email address"),
+			boolFlag("admin", "User is an admin"),
+			stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
+		},
+	}
+)
+
+func runCreateUser(c *cli.Context) error {
+	if !c.IsSet("name") {
+		return fmt.Errorf("Username is not specified")
+	} else if !c.IsSet("password") {
+		return fmt.Errorf("Password is not specified")
+	} else if !c.IsSet("email") {
+		return fmt.Errorf("Email is not specified")
+	}
+
+	if c.IsSet("config") {
+		setting.CustomConf = c.String("config")
+	}
+
+	setting.NewContext()
+	models.LoadConfigs()
+	models.SetEngine()
+
+	if err := models.CreateUser(&models.User{
+		Name:     c.String("name"),
+		Email:    c.String("email"),
+		Passwd:   c.String("password"),
+		IsActive: true,
+		IsAdmin:  c.Bool("admin"),
+	}); err != nil {
+		return fmt.Errorf("CreateUser: %v", err)
+	}
+
+	fmt.Printf("New user '%s' has been successfully created!\n", c.String("name"))
+	return nil
+}

cmd/cert.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var CmdCert = cli.Command{

cmd/cert_stub.go

@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 var CmdCert = cli.Command{

cmd/cmd.go

@@ -7,7 +7,7 @@ package cmd
 import (
 	"time"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )
 
 func stringFlag(name, value, usage string) cli.StringFlag {

cmd/dump.go

@@ -14,7 +14,7 @@ import (
 	"io/ioutil"
 
 	"github.com/Unknwon/cae/zip"
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/setting"
@@ -96,6 +96,10 @@ func runDump(ctx *cli.Context) error {
 		log.Fatalf("Fail to save %s: %v", fileName, err)
 	}
 
+	if err := os.Chmod(fileName, 0600); err != nil {
+		log.Printf("Can't change file access permissions mask to 0600: %v", err)
+	}
+
 	log.Printf("Removing tmp work dir: %s", TmpWorkDir)
 	os.RemoveAll(TmpWorkDir)
 	log.Printf("Finish dumping in file %s", fileName)

cmd/serve.go

@@ -14,8 +14,9 @@ import (
 	"time"
 
 	"github.com/Unknwon/com"
-	"github.com/codegangsta/cli"
+	git "github.com/gogits/git-module"
 	gouuid "github.com/satori/go.uuid"
+	"github.com/urfave/cli"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
@@ -100,7 +101,7 @@ func handleUpdateTask(uuid string, user, repoUser *models.User, reponame string,
 	}
 
 	if err = models.PushUpdate(models.PushUpdateOptions{
-		RefName:      task.RefName,
+		RefFullName:  task.RefName,
 		OldCommitID:  task.OldCommitID,
 		NewCommitID:  task.NewCommitID,
 		PusherID:     user.ID,
@@ -113,7 +114,7 @@ func handleUpdateTask(uuid string, user, repoUser *models.User, reponame string,
 
 	// Ask for running deliver hook and test pull request tasks.
 	reqURL := setting.LocalURL + repoUser.Name + "/" + reponame + "/tasks/trigger?branch=" +
-		strings.TrimPrefix(task.RefName, "refs/heads/") + "&secret=" + base.EncodeMD5(repoUser.Salt)
+		strings.TrimPrefix(task.RefName, git.BRANCH_PREFIX) + "&secret=" + base.EncodeMD5(repoUser.Salt) + "&pusher=" + com.ToStr(user.ID)
 	log.GitLogger.Trace("Trigger task: %s", reqURL)
 
 	resp, err := httplib.Head(reqURL).SetTLSClientConfig(&tls.Config{

cmd/update.go

@@ -7,7 +7,7 @@ package cmd
 import (
 	"os"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/log"

cmd/web.go

@@ -8,13 +8,13 @@ import (
 	"crypto/tls"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/http/fcgi"
 	"os"
 	"path"
 	"strings"
 
-	"github.com/codegangsta/cli"
 	"github.com/go-macaron/binding"
 	"github.com/go-macaron/cache"
 	"github.com/go-macaron/captcha"
@@ -25,6 +25,7 @@ import (
 	"github.com/go-macaron/toolbox"
 	"github.com/go-xorm/xorm"
 	"github.com/mcuadros/go-version"
+	"github.com/urfave/cli"
 	"gopkg.in/ini.v1"
 	"gopkg.in/macaron.v1"
 
@@ -72,8 +73,13 @@ func checkVersion() {
 	if err != nil {
 		log.Fatal(4, "Fail to read 'templates/.VERSION': %v", err)
 	}
-	if string(data) != setting.AppVer {
-		log.Fatal(4, "Binary and template file version does not match, did you forget to recompile?")
+	tplVer := string(data)
+	if tplVer != setting.AppVer {
+		if version.Compare(tplVer, setting.AppVer, ">") {
+			log.Fatal(4, "Binary version is lower than template file version, did you forget to recompile Gogs?")
+		} else {
+			log.Fatal(4, "Binary version is higher than template file version, did you forget to update template files?")
+		}
 	}
 
 	// Check dependency version.
@@ -87,8 +93,8 @@ func checkVersion() {
 		{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
 		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
 		{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
-		{"github.com/gogits/git-module", git.Version, "0.3.4"},
-		{"github.com/gogits/go-gogs-client", gogs.Version, "0.10.3"},
+		{"github.com/gogits/git-module", git.Version, "0.4.1"},
+		{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
 	}
 	for _, c := range checkers {
 		if !version.Compare(c.Version(), c.Expected, ">=") {
@@ -157,7 +163,7 @@ func newMacaron() *macaron.Macaron {
 	m.Use(cache.Cacher(cache.Options{
 		Adapter:       setting.CacheAdapter,
 		AdapterConfig: setting.CacheConn,
-		Interval:      setting.CacheInternal,
+		Interval:      setting.CacheInterval,
 	}))
 	m.Use(captcha.Captchaer(captcha.Options{
 		SubURL: setting.AppSubUrl,
@@ -324,6 +330,7 @@ func runWeb(ctx *cli.Context) error {
 			defer fr.Close()
 
 			ctx.Header().Set("Cache-Control", "public,max-age=86400")
+			ctx.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, attach.Name))
 			// Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
 			// We must put the name in " manually.
 			if err = repo.ServeData(ctx, "\""+attach.Name+"\"", fr); err != nil {
@@ -459,12 +466,12 @@ func runWeb(ctx *cli.Context) error {
 				m.Post("/label", repo.UpdateIssueLabel)
 				m.Post("/milestone", repo.UpdateIssueMilestone)
 				m.Post("/assignee", repo.UpdateIssueAssignee)
-				m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment)
 			}, reqRepoWriter)
 
 			m.Group("/:index", func() {
 				m.Post("/title", repo.UpdateIssueTitle)
 				m.Post("/content", repo.UpdateIssueContent)
+				m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment)
 			})
 		})
 		m.Group("/comments/:id", func() {
@@ -475,7 +482,8 @@ func runWeb(ctx *cli.Context) error {
 			m.Post("/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel)
 			m.Post("/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel)
 			m.Post("/delete", repo.DeleteLabel)
-		}, repo.MustEnableIssues, reqRepoWriter, context.RepoRef())
+			m.Post("/initialize", bindIgnErr(auth.InitializeLabelsForm{}), repo.InitializeLabels)
+		}, reqRepoWriter, context.RepoRef())
 		m.Group("/milestones", func() {
 			m.Combo("/new").Get(repo.NewMilestone).
 				Post(bindIgnErr(auth.CreateMilestoneForm{}), repo.NewMilestonePost)
@@ -483,18 +491,45 @@ func runWeb(ctx *cli.Context) error {
 			m.Post("/:id/edit", bindIgnErr(auth.CreateMilestoneForm{}), repo.EditMilestonePost)
 			m.Get("/:id/:action", repo.ChangeMilestonStatus)
 			m.Post("/delete", repo.DeleteMilestone)
-		}, repo.MustEnableIssues, reqRepoWriter, context.RepoRef())
+		}, reqRepoWriter, context.RepoRef())
 
 		m.Group("/releases", func() {
 			m.Get("/new", repo.NewRelease)
 			m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost)
-			m.Get("/edit/:tagname", repo.EditRelease)
-			m.Post("/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost)
+			m.Get("/edit/*", repo.EditRelease)
+			m.Post("/edit/*", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost)
 			m.Post("/delete", repo.DeleteRelease)
 		}, reqRepoWriter, context.RepoRef())
 
 		m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest).
 			Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost)
+
+		m.Group("", func() {
+			m.Combo("/_edit/*").Get(repo.EditFile).
+				Post(bindIgnErr(auth.EditRepoFileForm{}), repo.EditFilePost)
+			m.Combo("/_new/*").Get(repo.NewFile).
+				Post(bindIgnErr(auth.EditRepoFileForm{}), repo.NewFilePost)
+			m.Post("/_preview/*", bindIgnErr(auth.EditPreviewDiffForm{}), repo.DiffPreviewPost)
+			m.Combo("/_delete/*").Get(repo.DeleteFile).
+				Post(bindIgnErr(auth.DeleteRepoFileForm{}), repo.DeleteFilePost)
+
+			m.Group("", func() {
+				m.Combo("/_upload/*").Get(repo.UploadFile).
+					Post(bindIgnErr(auth.UploadRepoFileForm{}), repo.UploadFilePost)
+				m.Post("/upload-file", repo.UploadFileToServer)
+				m.Post("/upload-remove", bindIgnErr(auth.RemoveUploadFileForm{}), repo.RemoveUploadFileFromServer)
+			}, func(ctx *context.Context) {
+				if !setting.Repository.Upload.Enabled {
+					ctx.Handle(404, "", nil)
+					return
+				}
+			})
+		}, reqRepoWriter, context.RepoRef(), func(ctx *context.Context) {
+			if !ctx.Repo.Repository.CanEnableEditor() || ctx.Repo.IsViewCommit {
+				ctx.Handle(404, "", nil)
+				return
+			}
+		})
 	}, reqSignIn, context.RepoAssignment(), repo.MustBeNotBare)
 
 	m.Group("/:username/:reponame", func() {
@@ -533,12 +568,12 @@ func runWeb(ctx *cli.Context) error {
 			m.Get("/src/*", repo.Home)
 			m.Get("/raw/*", repo.SingleDownload)
 			m.Get("/commits/*", repo.RefCommits)
-			m.Get("/commit/:sha([a-z0-9]{40})$", repo.Diff)
+			m.Get("/commit/:sha([a-z0-9]{7,40})$", repo.Diff)
 			m.Get("/forks", repo.Forks)
 		}, context.RepoRef())
-		m.Get("/commit/:sha([a-z0-9]{40})\\.:ext(patch|diff)", repo.RawDiff)
+		m.Get("/commit/:sha([a-z0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff)
 
-		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.CompareDiff)
+		m.Get("/compare/:before([a-z0-9]{7,40})\\.\\.\\.:after([a-z0-9]{7,40})", repo.CompareDiff)
 	}, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare)
 	m.Group("/:username/:reponame", func() {
 		m.Get("/stars", repo.Stars)
@@ -576,13 +611,19 @@ func runWeb(ctx *cli.Context) error {
 
 	// Flag for port number in case first time run conflict.
 	if ctx.IsSet("port") {
-		setting.AppUrl = strings.Replace(setting.AppUrl, setting.HttpPort, ctx.String("port"), 1)
-		setting.HttpPort = ctx.String("port")
+		setting.AppUrl = strings.Replace(setting.AppUrl, setting.HTTPPort, ctx.String("port"), 1)
+		setting.HTTPPort = ctx.String("port")
 	}
 
-	var err error
-	listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
+	var listenAddr string
+	if setting.Protocol == setting.UNIX_SOCKET {
+		listenAddr = fmt.Sprintf("%s", setting.HTTPAddr)
+	} else {
+		listenAddr = fmt.Sprintf("%s:%s", setting.HTTPAddr, setting.HTTPPort)
+	}
 	log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
+
+	var err error
 	switch setting.Protocol {
 	case setting.HTTP:
 		err = http.ListenAndServe(listenAddr, m)
@@ -591,6 +632,21 @@ func runWeb(ctx *cli.Context) error {
 		err = server.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
 	case setting.FCGI:
 		err = fcgi.Serve(nil, m)
+	case setting.UNIX_SOCKET:
+		os.Remove(listenAddr)
+
+		var listener *net.UnixListener
+		listener, err = net.ListenUnix("unix", &net.UnixAddr{listenAddr, "unix"})
+		if err != nil {
+			break // Handle error after switch
+		}
+
+		// FIXME: add proper implementation of signal capture on all protocols
+		// execute this on SIGTERM or SIGINT: listener.Close()
+		if err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission)); err != nil {
+			log.Fatal(4, "Failed to set permission of unix socket: %v", err)
+		}
+		err = http.Serve(listener, m)
 	default:
 		log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
 	}

conf/app.ini

@@ -17,8 +17,33 @@ ANSI_CHARSET =
 FORCE_PRIVATE = false
 ; Global maximum creation limit of repository per user, -1 means no limit
 MAX_CREATION_LIMIT = -1
-; Patch test queue length, make it as large as possible
-PULL_REQUEST_QUEUE_LENGTH = 10000
+; Mirror sync queue length, increase if mirror syncing starts hanging
+MIRROR_QUEUE_LENGTH = 1000
+; Patch test queue length, increase if pull request patch testing starts hanging
+PULL_REQUEST_QUEUE_LENGTH = 1000
+; Preferred Licenses to place at the top of the List
+; Name must match file name in conf/license or custom/conf/license
+PREFERRED_LICENSES = Apache License 2.0,MIT License
+
+[repository.editor]
+; List of file extensions that should have line wraps in the CodeMirror editor
+; Separate extensions with a comma. To line wrap files w/o extension, just put a comma
+LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
+; Valid file modes that have a preview API associated with them, such as api/v1/markdown
+; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
+PREVIEWABLE_FILE_MODES = markdown
+
+[repository.upload]
+; Whether repository file uploads are enabled. Defaults to `true`
+ENABLED = true
+; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gogs restart)
+TEMP_PATH = data/tmp/uploads
+; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
+ALLOWED_TYPES =
+; Max size of each file in MB. Defaults to 3MB
+FILE_MAX_SIZE = 3
+; Max number of files per upload. Defaults to 5
+MAX_FILES = 5
 
 [ui]
 ; Number of repositories that are showed in one explore page
@@ -54,6 +79,9 @@ ENABLE_HARD_LINE_BREAK = false
 ; List of custom URL-Schemes that are allowed as links when rendering Markdown
 ; for example git,magnet
 CUSTOM_URL_SCHEMES =
+; List of file extensions that should be rendered/edited as Markdown
+; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
+FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
 
 [server]
 PROTOCOL = http
@@ -61,6 +89,8 @@ DOMAIN = localhost
 ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
 HTTP_ADDR = 0.0.0.0
 HTTP_PORT = 3000
+; Permission for unix socket
+UNIX_SOCKET_PERMISSION = 666
 ; Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service.
 ; In most cases you do not need to change the default value.
 ; Alter it only if your SSH server node is not the same as HTTP node.
@@ -156,7 +186,7 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
 ENABLE_CAPTCHA = true
 
 [webhook]
-; Hook task queue length
+; Hook task queue length, increase if webhook shooting starts hanging
 QUEUE_LENGTH = 1000
 ; Deliver timeout in seconds
 DELIVER_TIMEOUT = 5
@@ -232,7 +262,7 @@ GRAVATAR_SOURCE = gravatar
 ; This value will be forced to be true in offline mode.
 DISABLE_GRAVATAR = false
 ; Federated avatar lookup uses DNS to discover avatar associated
-; with emails, see http://www.libravatar.org
+; with emails, see https://www.libravatar.org
 ; This value will be forced to be false in offline mode or Gravatar is disbaled.
 ENABLE_FEDERATED_AVATAR = false
 
@@ -361,7 +391,7 @@ GC = 60
 
 [mirror]
 ; Default interval in hours between each check
-DEFAULT_INTERVAL = 24
+DEFAULT_INTERVAL = 8
 
 [api]
 ; Max number of items will response in a page

conf/label/Default

@@ -0,0 +1,7 @@
+#ee0701 bug
+#cccccc duplicate
+#84b6eb enhancement
+#128a0c help wanted
+#e6e6e6 invalid
+#cc317c question
+#ffffff wontfix

conf/locale/locale_bg-BG.ini

@@ -189,6 +189,13 @@ TeamName=Име на екипа
 AuthName=Име на удостоверението
 AdminEmail=Ел. поща на администратора
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` не може да бъде празен.`
 alpha_dash_error=` трябва да e валидна буква, число или тире(-_).`
 alpha_dash_dot_error=` трябва да e валидна буква, число, тире(-_) или точка.`
@@ -363,6 +370,7 @@ mirror_prune_desc=Премахва всички препратки за отда
 mirror_interval=Интервал на отразяване (часове)
 mirror_address=Адрес на огледало
 mirror_address_desc=Моля включете потребител и парола в адреса ако са нужни.
+mirror_last_synced=Last Synced
 watchers=Наблюдаващи
 stargazers=Харесващи
 forks=Разклонения
@@ -419,6 +427,44 @@ file_view_raw=Виж директен файл
 file_permalink=Постоянна връзка
 file_too_large=Този файл е твърде голям за да се визуализира
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Ревизии
 commits.search=Търсене в ревизии
 commits.find=Намери
@@ -444,6 +490,11 @@ issues.create=Създай задача
 issues.new_label=Нов етикет
 issues.new_label_placeholder=Име на етикета...
 issues.create_label=Създай етикет
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d отворени
 issues.close_tab=%d затворени
 issues.filter_label=Етикет
@@ -485,8 +536,7 @@ issues.commit_ref_at=`посочи тази задача от ревизия <a
 issues.poster=Участник
 issues.collaborator=Сътрудник
 issues.owner=Притежател
-issues.sign_up_for_free=Регистрирай се безплатно
-issues.sign_in_require_desc=за да се включите в този разговор. Вече имате профил? <a href="%s">Влезте, за да коментирате</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Редакция
 issues.cancel=Отказ
 issues.save=Запис
@@ -501,6 +551,8 @@ issues.label_deletion=Изтрий етикет
 issues.label_deletion_desc=При изтриване на този етикет ще се премахне информацията за него във всички свързани задачи. Желаете ли да продължите?
 issues.label_deletion_success=Етикетът е изтрит успешно!
 issues.num_participants=%d участника
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Нова заявка за сливане
 pulls.compare_changes=Сравни промените
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Недефинирано
 settings.hooks=Уеб-куки
 settings.githooks=Git куки
 settings.basic_settings=Основни настройки
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Официален сайт
 settings.update_settings=Запази настройките
 settings.change_reponame_prompt=Тази промяна ще засегне връзките, които се отнасят до това хранилището.
@@ -665,6 +720,8 @@ settings.event_send_everything=При <strong>всички</strong> събити
 settings.event_choose=Нека избера от какво имам нужда.
 settings.event_create=Създаване
 settings.event_create_desc=Създаване на клон или маркер
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Предаване
 settings.event_push_desc=Git предаване към хранилището
 settings.active=Активна

conf/locale/locale_cs-CZ.ini

@@ -189,6 +189,13 @@ TeamName=Název týmu
 AuthName=Název ověření
 AdminEmail=E-mailová adresa správce
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` nemůže být prázdný.`
 alpha_dash_error=` musí být pouze písmena, číslice či znaky - a _ .`
 alpha_dash_dot_error=` musí být pouze písmena, číslice, tečka či znaky - a _ .`
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=Odstup zrcadlení (hodina)
 mirror_address=Adresa zrcadla
 mirror_address_desc=Prosím, přidejte do adresy potřebné přihlašovací údaje.
+mirror_last_synced=Last Synced
 watchers=Sledující
 stargazers=Sledující
 forks=Rozštěpení
@@ -419,6 +427,44 @@ file_view_raw=Zobrazit v surovém stavu
 file_permalink=Trvalý odkaz
 file_too_large=This file is too large to be shown
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Revize
 commits.search=Hledání revizí
 commits.find=Hledat
@@ -444,6 +490,11 @@ issues.create=Vytvořit úkol
 issues.new_label=Nový štítek
 issues.new_label_placeholder=Název štítku...
 issues.create_label=Vytvořit štítek
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d otevřených
 issues.close_tab=%d zavřených
 issues.filter_label=Štítek
@@ -485,8 +536,7 @@ issues.commit_ref_at=`odkázal na tento úkol z revize <a id="%[1]s" href="#%[1]
 issues.poster=Autor
 issues.collaborator=Spolupracovník
 issues.owner=Vlastník
-issues.sign_up_for_free=Zaregistrujte se zdarma
-issues.sign_in_require_desc=pro zapojení do konverzace. Již máte účet? <a href="%s">Přihlaste se</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Upravit
 issues.cancel=Zrušit
 issues.save=Uložit
@@ -501,6 +551,8 @@ issues.label_deletion=Smazání štítku
 issues.label_deletion_desc=Smazání tohoto štítku jej smaže také ze všech návazných úkolech. Chcete pokračovat?
 issues.label_deletion_success=Štítek byl úspěšně smazán!
 issues.num_participants=%d účastníků
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Nový požadavek na natažení
 pulls.compare_changes=Porovnat změny
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Undefined
 settings.hooks=Webové háčky
 settings.githooks=Háčky Gitu
 settings.basic_settings=Základní nastavení
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Oficiální stránky
 settings.update_settings=Změnit nastavení
 settings.change_reponame_prompt=Tato změna ovlivní vztah odkazů k repositáři.
@@ -665,6 +720,8 @@ settings.event_send_everything=Potřebuji <strong>vše</strong>.
 settings.event_choose=Nech mne vybrat, co potřebuji.
 settings.event_create=Vytvořit
 settings.event_create_desc=Větev nebo značka byla vytvořena
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Nahrát
 settings.event_push_desc=Nahrání pomocí Gitu do repositáře
 settings.active=Aktivní

conf/locale/locale_de-DE.ini

@@ -47,7 +47,7 @@ cancel=Abbrechen
 [install]
 install=Installation
 title=Installationsschritte für den ersten Start
-docker_helper=Wenn Gogs innerhalb Docker läuft, lesen Sie sich bitte den <a target="_blank" href="%s">Leitfaden</a> genau durch, bevor Sie irgendwas auf dieser Seite ändern!
+docker_helper=Wenn Gogs innerhalb von Docker läuft, lesen Sie sich bitte den <a target="_blank" href="%s">Leitfaden</a> genau durch, bevor Sie irgendwas auf dieser Seite ändern!
 requite_db_desc=Gogs benötigt MySQL, PostgreSQL, SQLite3 oder TiDB.
 db_title=Datenbankeinstellungen
 db_type=Datenbanktyp
@@ -96,8 +96,8 @@ offline_mode=Offline-Modus aktivieren
 offline_mode_popup=CDN auch im Produktivmodus deaktivieren. Alle Dateien werden von diesem Server ausgeliefert.
 disable_gravatar=Gravatar-Dienst deaktivieren
 disable_gravatar_popup=Gravatar und benutzerdefinierte Quellen deaktivieren. Alle Profilbilder werden vom Nutzer hochgeladen oder sind das Standard-Profilbild.
-federated_avatar_lookup=Enable Federated Avatars Lookup
-federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Suche nach föderierten Profilbildern einschalten
+federated_avatar_lookup_popup=Der Suche nach föderierten Profilbildern die Verwendung von föderierten open source Services basierend auf libravatar erlauben.
 disable_registration=Registrierung deaktivieren
 disable_registration_popup=Registrierung neuer Benutzer deaktivieren. Nur Administratoren können Benutzerkonten anlegen.
 enable_captcha=Captcha aktivieren
@@ -189,6 +189,13 @@ TeamName=Teamname
 AuthName=Name der Autorisierung
 AdminEmail=Administrator E-Mail
 
+NewBranchName=Neuer Branch Name
+CommitSummary=Commit Zusammenfassung
+CommitMessage=Commit Nachricht
+CommitChoice=Commit Auswahl
+TreeName=Dateipfad
+Content=Inhalt
+
 require_error=` darf nicht leer sein.`
 alpha_dash_error=` kann ausschließlich alphanumerische Zeichen und "-_" enthalten.`
 alpha_dash_dot_error=` kann ausschließlich alphanumerische Zeichen und ".-_" enthalten.`
@@ -241,7 +248,7 @@ form.name_pattern_not_allowed=Benutzernamen der Form '%s' sind nicht erlaubt.
 [settings]
 profile=Profil
 password=Passwort
-avatar=Avatar
+avatar=Profilbild
 ssh_keys=SSH-Schlüssel
 social=Soziale Konten
 applications=Anwendungen
@@ -262,8 +269,8 @@ change_username_prompt=Diese Änderung wirkt sich auf die Links zu Ihrem Benutze
 continue=Weiter
 cancel=Abbrechen
 
-lookup_avatar_by_mail=Lookup Avatar by mail
-federated_avatar_lookup=Federated Avatar Lookup
+lookup_avatar_by_mail=Suche nach Profilbildern via E-Mail
+federated_avatar_lookup=Suche nach föderierten Profilbildern
 enable_custom_avatar=Benutzerdefiniertes Profilbild aktivieren
 choose_new_avatar=Neues Profilbild auswählen
 update_avatar=Profilbildeinstellungen aktualisieren
@@ -350,7 +357,7 @@ fork_from=Fork von
 fork_visiblity_helper=Die Sichtbarkeit von geforkten Repositories ist nicht veränderbar.
 repo_desc=Beschreibung
 repo_lang=Sprache
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Wählen Sie eine .gitignore Vorlage aus
 license=Lizenz
 license_helper=Wählen Sie eine Lizenz aus
 readme=Readme
@@ -363,6 +370,7 @@ mirror_prune_desc=Entferne alle Verweise auf nicht mehr existierende entfernte R
 mirror_interval=Mirror-Intervall (in Stunden)
 mirror_address=Mirror-Adresse
 mirror_address_desc=Bitte die nötigen Zugangsdaten in die Adresse mit aufnehmen.
+mirror_last_synced=Zuletzt synchronisiert
 watchers=Beobachter
 stargazers=In Favoriten von
 forks=Forks
@@ -419,6 +427,44 @@ file_view_raw=Ansicht im Originalformat
 file_permalink=Permalink
 file_too_large=Diese Datei ist zu groß zum Anzeigen
 
+editor.new_file=Neue Datei
+editor.upload_file=Datei hochladen
+editor.edit_file=Datei bearbeiten
+editor.preview_changes=Vorschau der Änderungen
+editor.cannot_edit_non_text_files=Nicht-Text Dateien können nicht bearbeitet werden
+editor.edit_this_file=Diese Datei bearbeiten
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=Um die Datei zu bearbeiten müssen Sie das Repository forken
+editor.delete_this_file=Diese Datei löschen
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=Die Datei '%s' wurde erfolgreich gelöscht!
+editor.name_your_file=Dateinamen eingeben...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=oder
+editor.cancel_lower=abbrechen
+editor.commit_changes=Änderungen im Commit
+editor.add_tmpl=Hinzufügen von '%s/<filename>'
+editor.add='%s' hinzufügen
+editor.update='%s' ändern
+editor.delete='%s' löschen
+editor.commit_message_desc=Eine optionale, erweiterte Commit Beschreibung...
+editor.commit_directly_to_this_branch=Änderungen direkt dem Branch <strong class="branch-name">%s</strong> hinzufügen.
+editor.create_new_branch=Erstellen Sie einen <strong>neuen Branch</strong> für diesen Commit und starten Sie einen Pull Request.
+editor.new_branch_name_desc=Neuer Branch Name...
+editor.cancel=Abbrechen
+editor.filename_cannot_be_empty=Der Dateiname darf nicht leer sein.
+editor.branch_already_exists=Branch '%s' existiert bereits in diesem Repository.
+editor.directory_is_a_file='%s' im übergeordneten Verzeichnis ist eine Datei und kein Verzeichnis.
+editor.filename_is_a_directory=Die Datei '%s' existiert bereits als Verzeichnis in diesem Repository.
+editor.file_editing_no_longer_exists=Die Datei '%s' welche Sie bearbeiten existiert in diesem Repository nicht mehr.
+editor.file_changed_while_editing=Seit dem Start der Bearbeitung hat sich die Datei geändert. <a target="_blank" href="%s">Hier klicken</a> um die Änderungen zu sehen, oder nochmals <strong>Commit drücken</strong> um die Änderungen zu überschreiben.
+editor.file_already_exists=Eine Datei mit dem Namen '%s' existiert bereits in diesem Repository.
+editor.no_changes_to_show=Keine Änderungen vorhanden.
+editor.fail_to_update_file=Fehler beim Ändern/Erstellen der Datei '%s'. Fehler: %v
+editor.add_subdir=Unterverzeichnis erstellen...
+editor.unable_to_upload_files=Fehler beim Hochladen der Dateien zu '%s'. Fehler: %v
+editor.upload_files_to_dir=Dateien hochladen nach '%s'
+
 commits.commits=Commits
 commits.search=Commits durchsuchen
 commits.find=Finden
@@ -444,6 +490,11 @@ issues.create=Issue erstellen
 issues.new_label=Neues Label
 issues.new_label_placeholder=Label-Name...
 issues.create_label=Label erstellen
+issues.label_templates.title=Lade vordefinierte Label
+issues.label_templates.info=Es sind noch keine Label vorhanden. Sie können vordefinierte Label benutzen, oder auf "Neues Label" klicken um eines zu erstellen.
+issues.label_templates.helper=Wählen Sie ein Label
+issues.label_templates.use=Dieses Label Set benutzen
+issues.label_templates.fail_to_load_file=Fehler beim Laden der Label Template Datei '%s': %v
 issues.open_tab=%d offen
 issues.close_tab=%d geschlossen
 issues.filter_label=Label
@@ -485,8 +536,7 @@ issues.commit_ref_at=`hat dieses Issue <a id="%[1]s" href="#%[1]s">%[2]s</a> aus
 issues.poster=Ersteller
 issues.collaborator=Mitarbeiter
 issues.owner=Besitzer
-issues.sign_up_for_free=Kostenlos anmelden
-issues.sign_in_require_desc=um dieser Diskussion beizutreten. Haben Sie bereits ein Konto? <a href="%s">Anmelden um zu kommentieren</a>
+issues.sign_in_require_desc=<a href="%s">Anmelden</a> um an der Diskussion teilzunehmen.
 issues.edit=Bearbeiten
 issues.cancel=Abbrechen
 issues.save=Speichern
@@ -501,6 +551,8 @@ issues.label_deletion=Label löschen
 issues.label_deletion_desc=Das Label wird von allen verknüpften Issues entfernt. Möchten Sie fortfahren?
 issues.label_deletion_success=Label wurde erfolgreich gelöscht!
 issues.num_participants=%d Beteiligte
+issues.attachment.open_tab=`Klicken um "%s" in einem neuen Tab zu öffnen`
+issues.attachment.download=`Klicken um "%s" herunterzuladen`
 
 pulls.new=Neuer Pull-Request
 pulls.compare_changes=Änderungen vergleichen
@@ -580,17 +632,20 @@ settings.collaboration.undefined=Nicht definiert
 settings.hooks=Webhooks
 settings.githooks=Git-Hooks
 settings.basic_settings=Grundeinstellungen
+settings.mirror_settings=Mirror Einstellungen
+settings.sync_mirror=Jetzt synchronisieren
+settings.mirror_sync_in_progress=Mirror Synchronisierung läuft, bitte die Seite in ca. einer Minute neu laden.
 settings.site=Offizielle Webseite
 settings.update_settings=Einstellungen speichern
 settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich Links auf Repositories beziehen.
 settings.advanced_settings=Erweiterte Einstellungen
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Wiki einschalten
+settings.use_internal_wiki=Eingebautes Wiki verwenden
 settings.use_external_wiki=Externes Wiki verwenden
 settings.external_wiki_url=Externe Wiki URL
 settings.external_wiki_url_desc=Besucher werden auf diese URL umgeleitet, wenn sie auf den Tab klicken.
-settings.issues_desc=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Issue-Tracker einschalten
+settings.use_internal_issue_tracker=Eingebauten Issue-Tracker verwenden
 settings.use_external_issue_tracker=Externes Issue-System verwenden
 settings.tracker_url_format=URL-Format des externen Issue-Systems
 settings.tracker_issue_style=Namenskonvention des externen Issue-Trackers:
@@ -665,6 +720,8 @@ settings.event_send_everything=Ich brauche <strong>alles</strong>.
 settings.event_choose=Lass mich auswählen, was ich brauche.
 settings.event_create=Erstellen
 settings.event_create_desc=Branch/Tag erstellt
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push auf ein Repository
 settings.active=Aktiv
@@ -973,7 +1030,7 @@ auths.still_in_used=Diese Authentifizierung wird noch von einigen Benutzern verw
 auths.deletion_success=Authentifizierung wurde erfolgreich gelöscht!
 
 config.server_config=Serverkonfiguration
-config.app_name=Anwendungsname
+config.app_name=Name der Anwendung
 config.app_ver=Anwendungsversion
 config.app_url=Anwendungs-URL
 config.domain=Domain
@@ -1056,19 +1113,19 @@ config.cookie_life_time=Cookie-Lebensdauer
 config.picture_config=Konfiguration der Profilbilder
 config.picture_service=Bildservice
 config.disable_gravatar=Gravatar deaktivieren
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Föderierte Profilbilder einschalten
 
-config.git_config=Git Configuration
-config.git_disable_diff_highlight=Disable Diff Syntax Highlight
-config.git_max_diff_lines=Max Diff Lines (for a single file)
-config.git_max_diff_line_characters=Max Diff Characters (for a single line)
-config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_migrate_timeout=Migration Timeout
-config.git_mirror_timeout=Mirror Update Timeout
-config.git_clone_timeout=Clone Operation Timeout
-config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_config=Git Konfiguration
+config.git_disable_diff_highlight=Diff Syntaxhervorhebung ausschalten
+config.git_max_diff_lines=Max Diff Zeilen (in einer Datei)
+config.git_max_diff_line_characters=Max Diff Zeichen (in einer Zeile)
+config.git_max_diff_files=Max Diff Dateien (Anzeige)
+config.git_gc_args=GC-Argumente
+config.git_migrate_timeout=Zeitlimit für Migration
+config.git_mirror_timeout=Zeitlimit für Mirror-Aktualisierung
+config.git_clone_timeout=Zeitlimit für Clone
+config.git_pull_timeout=Zeitlimit für Pull
+config.git_gc_timeout=Zeitlimit für GC
 
 config.log_config=Konfiguration des Loggings
 config.log_mode=Log-Modus

conf/locale/locale_en-US.ini

@@ -189,6 +189,13 @@ TeamName = Team name
 AuthName = Authorization name
 AdminEmail = Admin email
 
+NewBranchName = New branch name
+CommitSummary = Commit summary
+CommitMessage = Commit message
+CommitChoice = Commit choice
+TreeName = File path
+Content = Content
+
 require_error = ` cannot be empty.`
 alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.`
 alpha_dash_dot_error = ` must be valid alpha or numeric or dash(-_) or dot characters.`
@@ -363,6 +370,7 @@ mirror_prune_desc = Remove any remote-tracking references that no longer exist o
 mirror_interval = Mirror Interval (hour)
 mirror_address = Mirror Address
 mirror_address_desc = Please include necessary user credentials in the address.
+mirror_last_synced = Last Synced
 watchers = Watchers
 stargazers = Stargazers
 forks = Forks
@@ -419,6 +427,44 @@ file_view_raw = View Raw
 file_permalink = Permalink
 file_too_large = This file is too large to be shown
 
+editor.new_file = New file
+editor.upload_file = Upload file
+editor.edit_file = Edit file
+editor.preview_changes = Preview Changes
+editor.cannot_edit_non_text_files = Cannot edit non-text files
+editor.edit_this_file = Edit this file
+editor.must_be_on_a_branch = You must be on a branch to make or propose changes to this file
+editor.fork_before_edit = You must fork this repository before editing the file
+editor.delete_this_file = Delete this file
+editor.must_have_write_access = You must have write access to make or propose changes to this file
+editor.file_delete_success = File '%s' has been deleted successfully!
+editor.name_your_file = Name your file...
+editor.filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or = or
+editor.cancel_lower = cancel
+editor.commit_changes = Commit Changes
+editor.add_tmpl = Add '%s/<filename>'
+editor.add = Add '%s'
+editor.update = Update '%s'
+editor.delete = Delete '%s'
+editor.commit_message_desc = Add an optional extended description...
+editor.commit_directly_to_this_branch = Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch = Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc = New branch name...
+editor.cancel = Cancel
+editor.filename_cannot_be_empty = Filename cannot be empty.
+editor.branch_already_exists = Branch '%s' already exists in this repository.
+editor.directory_is_a_file = Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory = The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists = The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing = File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists = A file with name '%s' already exists in this repository.
+editor.no_changes_to_show = There are no changes to show.
+editor.fail_to_update_file = Failed to update/create file '%s' with error: %v
+editor.add_subdir = Add subdirectory...
+editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir = Upload files to '%s'
+
 commits.commits = Commits
 commits.search = Search commits
 commits.find = Find
@@ -444,6 +490,11 @@ issues.create = Create Issue
 issues.new_label = New Label
 issues.new_label_placeholder = Label name...
 issues.create_label = Create Label
+issues.label_templates.title = Load a predefined set of labels
+issues.label_templates.info = There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper = Select a label set
+issues.label_templates.use = Use this label set
+issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v
 issues.open_tab = %d Open
 issues.close_tab = %d Closed
 issues.filter_label = Label
@@ -485,8 +536,7 @@ issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="
 issues.poster = Poster
 issues.collaborator = Collaborator
 issues.owner = Owner
-issues.sign_up_for_free = Sign up for free
-issues.sign_in_require_desc = to join this conversation. Already have an account? <a href="%s">Sign in to comment</a>
+issues.sign_in_require_desc = <a href="%s">Sign in</a> to join this conversation.
 issues.edit = Edit
 issues.cancel = Cancel
 issues.save = Save
@@ -501,6 +551,8 @@ issues.label_deletion = Label Deletion
 issues.label_deletion_desc = Deleting this label will remove its information in all related issues. Do you want to continue?
 issues.label_deletion_success = Label has been deleted successfully!
 issues.num_participants = %d Participants
+issues.attachment.open_tab = `Click to see "%s" in a new tab`
+issues.attachment.download = `Click to download "%s"`
 
 pulls.new = New Pull Request
 pulls.compare_changes = Compare Changes
@@ -580,6 +632,9 @@ settings.collaboration.undefined = Undefined
 settings.hooks = Webhooks
 settings.githooks = Git Hooks
 settings.basic_settings = Basic Settings
+settings.mirror_settings = Mirror Settings
+settings.sync_mirror = Sync Now
+settings.mirror_sync_in_progress = Mirror syncing is in progress, please refresh page in about a minute.
 settings.site = Official Site
 settings.update_settings = Update Settings
 settings.change_reponame_prompt = This change will affect how links relate to the repository.
@@ -665,6 +720,8 @@ settings.event_send_everything = I need <strong>everything</strong>.
 settings.event_choose = Let me choose what I need.
 settings.event_create = Create
 settings.event_create_desc = Branch, or tag created
+settings.event_pull_request = Pull Request
+settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push = Push
 settings.event_push_desc = Git push to a repository
 settings.active = Active
@@ -971,6 +1028,7 @@ auths.delete_auth_title = Authentication Deletion
 auths.delete_auth_desc = This authentication is going to be deleted, do you want to continue?
 auths.still_in_used = This authentication is still used by some users, please delete or convert these users to another login type first.
 auths.deletion_success = Authentication has been deleted successfully!
+auths.login_source_exist = Login source '%s' already exists.
 
 config.server_config = Server Configuration
 config.app_name = Application Name

conf/locale/locale_es-ES.ini

@@ -96,8 +96,8 @@ offline_mode=Activar el modo Sin Conexión
 offline_mode_popup=Desactivar el CDN incluso en el modo de producción, todos los recursos se servirán localmente.
 disable_gravatar=Desactivar el servicio Gravatar
 disable_gravatar_popup=Desactivar Gravatar y cualquier otra fuente personalizada. Todos los avatares deben ser cargados por los usuarios o en su defecto se mostrará el avatar predeterminado.
-federated_avatar_lookup=Enable Federated Avatars Lookup
-federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Habilitar búsqueda de Avatares Federados
+federated_avatar_lookup_popup=Habilitar búsqueda de avatares federador para usar el servicio federado de código abierto basado en libravatar.
 disable_registration=Desactivar Auto-Registro
 disable_registration_popup=Desactivar auto-registro del usuario, solo el administrador podrá crear cuentas nuevas.
 enable_captcha=Activar la Captcha
@@ -189,6 +189,13 @@ TeamName=Nombre del equipo
 AuthName=Nombre de autorización
 AdminEmail=Correo electrónico del administrador
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` no puede estar vacío.`
 alpha_dash_error=` los caracteres deben ser Alfanumericos o dash(-_).`
 alpha_dash_dot_error=` debe ser un caracter alfanumérivo válido, un guión alto o bajo (-_) o un signo de puntuación.`
@@ -262,8 +269,8 @@ change_username_prompt=Este cambio afectará a los enlaces que hacen referencia
 continue=Continuar
 cancel=Cancelar
 
-lookup_avatar_by_mail=Lookup Avatar by mail
-federated_avatar_lookup=Federated Avatar Lookup
+lookup_avatar_by_mail=Buscar avatar por correo
+federated_avatar_lookup=Búsqueda de Avatar Federado
 enable_custom_avatar=Activar avatar personalizado
 choose_new_avatar=Selecciona nuevo avatar
 update_avatar=Actualizar configuración del avatar
@@ -350,7 +357,7 @@ fork_from=Crear un Fork desde
 fork_visiblity_helper=No es posible cambiar la visibilidad de un Fork
 repo_desc=Descripción
 repo_lang=Idioma
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Seleccionar plantillas de .gitignore
 license=Licencia
 license_helper=Selecciona un fichero de licencia
 readme=Readme
@@ -363,6 +370,7 @@ mirror_prune_desc=Remover referencias remotas que no existan remotamente
 mirror_interval=Intervalo de la réplica (en horas)
 mirror_address=Dirección de la réplica
 mirror_address_desc=Por favor, incluya las credenciales de usuario necesarias en la dirección.
+mirror_last_synced=Last Synced
 watchers=Seguidores
 stargazers=Fans
 forks=Forks
@@ -419,6 +427,44 @@ file_view_raw=Ver Raw
 file_permalink=Permalink
 file_too_large=Este archivo es demasiado grande para ser mostrado
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commits
 commits.search=Buscar Commits
 commits.find=Buscar
@@ -444,6 +490,11 @@ issues.create=Crear incidencia
 issues.new_label=Nueva Etiqueta
 issues.new_label_placeholder=Nombre etiqueta...
 issues.create_label=Crear etiqueta
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d abiertas
 issues.close_tab=%d cerradas
 issues.filter_label=Etiqueta
@@ -485,8 +536,7 @@ issues.commit_ref_at=`mencionada esta incidencia en un commit <a id="%[1]s" href
 issues.poster=Autor
 issues.collaborator=Colaborador
 issues.owner=Propietario
-issues.sign_up_for_free=Registro gratuito
-issues.sign_in_require_desc=para unirse a esta conversación. ¿Ya dispone de una cuenta? <a href="%s">Inicie sesión para comentar</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Editar
 issues.cancel=Cancelar
 issues.save=Guardar
@@ -501,6 +551,8 @@ issues.label_deletion=Borrado de Etiqueta
 issues.label_deletion_desc=Al borrar la etiqueta su información será eliminada de todas las incidencias relacionadas. Desea continuar?
 issues.label_deletion_success=Etiqueta borrada con éxito!
 issues.num_participants=%d participantes
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Nuevo Pull Request
 pulls.compare_changes=Comparar cambios
@@ -580,17 +632,20 @@ settings.collaboration.undefined=Indefinido
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Configuración Básica
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Sitio oficial
 settings.update_settings=Actualizar configuración
 settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositorio.
 settings.advanced_settings=Ajustes avanzados
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Activar sistema de wiki
+settings.use_internal_wiki=Usar wiki integrada
 settings.use_external_wiki=Usar Wiki externa
 settings.external_wiki_url=URL externa de la Wiki
 settings.external_wiki_url_desc=Los visitantes serán redireccionados a la URL cuando hagan click en la barra.
-settings.issues_desc=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Habilitar rastreo de incidencias
+settings.use_internal_issue_tracker=Usar rastreo de incidencias ligero incluido
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
 settings.tracker_url_format=Formato URL del tracker de incidencias externo
 settings.tracker_issue_style=Estilo de etiquetado del tracker externo de incidencias:
@@ -665,6 +720,8 @@ settings.event_send_everything=Necesito <strong>todo</strong>.
 settings.event_choose=Déjeme elegir lo que necesito.
 settings.event_create=Crear
 settings.event_create_desc=Rama o etiqueta creada
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push a un repositorio
 settings.active=Activo
@@ -1056,19 +1113,19 @@ config.cookie_life_time=Tiempo de Vida de la Cookie
 config.picture_config=Configuración de Imagen
 config.picture_service=Servicio de Imágen
 config.disable_gravatar=Desactivar Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Habilitar Avatares Federados
 
-config.git_config=Git Configuration
-config.git_disable_diff_highlight=Disable Diff Syntax Highlight
-config.git_max_diff_lines=Max Diff Lines (for a single file)
-config.git_max_diff_line_characters=Max Diff Characters (for a single line)
-config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_migrate_timeout=Migration Timeout
-config.git_mirror_timeout=Mirror Update Timeout
-config.git_clone_timeout=Clone Operation Timeout
-config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_config=Configuración de Git
+config.git_disable_diff_highlight=Desactivar resaltado de sintaxis del Diff
+config.git_max_diff_lines=Líneas de Diff máximas (por un solo archivo)
+config.git_max_diff_line_characters=Carácteres de Diff máximos (para una sola línea)
+config.git_max_diff_files=Máximo de archivos de Diff (que se mostrarán)
+config.git_gc_args=Argumentos de GC
+config.git_migrate_timeout=Tiempo de espera de migración
+config.git_mirror_timeout=Tiempo de espera de actualización de espejos
+config.git_clone_timeout=Tiempo de espera de operación de clones
+config.git_pull_timeout=Tiempo de espera de operación de pull
+config.git_gc_timeout=Tiempo de espera de operación de GC
 
 config.log_config=Configuración del Log
 config.log_mode=Modo del Log

conf/locale/locale_fi-FI.ini

@@ -189,6 +189,13 @@ TeamName=Tiimin nimi
 AuthName=Luvan nimi
 AdminEmail=Ylläpito sähköposti
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` ei voi olla tyhjä.`
 alpha_dash_error=` täytyy olla kirjaimia tai numeroita tai väliviiva(-_) merkkejä.`
 alpha_dash_dot_error=` täytyy olla kirjaimia tai numeroita tai väliviiva(-_) tai piste merkkejä.`
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=Peili aikaväli (tuntia)
 mirror_address=Peili osoite
 mirror_address_desc=Ole hyvä ja liitä osoitteeseen tarvittavat käyttäjätunnukset.
+mirror_last_synced=Last Synced
 watchers=Tarkkailijat
 stargazers=Tähtiharrastajat
 forks=Haarat
@@ -419,6 +427,44 @@ file_view_raw=Näytä raaka
 file_permalink=Pysyvä linkki
 file_too_large=This file is too large to be shown
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commitit
 commits.search=Etsi commiteista
 commits.find=Etsi
@@ -444,6 +490,11 @@ issues.create=Ilmoita ongelma
 issues.new_label=Uusi tunniste
 issues.new_label_placeholder=Tunnisteen nimi...
 issues.create_label=Luo tunniste
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d avoinna
 issues.close_tab=%d suljettu
 issues.filter_label=Tunniste
@@ -485,8 +536,7 @@ issues.commit_ref_at=`viittasi tähän ongelmaan commitissa <a id="%[1]s" href="
 issues.poster=Tekijä
 issues.collaborator=Yhteistyökumppani
 issues.owner=Omistaja
-issues.sign_up_for_free=Rekisteröidy ilmaiseksi
-issues.sign_in_require_desc=liittyäksesi tähän keskusteluu. Onko sinulla jo tili? <a href="%s">Kirjaudu sisään kommentoidaksesi</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Muokkaa
 issues.cancel=Peruuta
 issues.save=Tallenna
@@ -501,6 +551,8 @@ issues.label_deletion=Tunnisteen poistaminen
 issues.label_deletion_desc=Tämän tunnisteen poistaminen poistaa sen tiedot kaikista siihen liittyvistä ongelmista. Haluatko jatkaa?
 issues.label_deletion_success=Tunniste on poistettu onnistuneesti!
 issues.num_participants=%d osallistujaa
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Uusi pull pyyntö
 pulls.compare_changes=Vertaa muutoksia
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Undefined
 settings.hooks=Webkoukut
 settings.githooks=Git koukut
 settings.basic_settings=Perusasetukset
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Virallinen sivusto
 settings.update_settings=Päivitä asetukset
 settings.change_reponame_prompt=Tämä muutos vaikuttaa siihen miten linkit liittyvät repoon.
@@ -665,6 +720,8 @@ settings.event_send_everything=Tarvitsen <strong>kaiken</strong>.
 settings.event_choose=Haluan valita, mitä tarvitsen.
 settings.event_create=Luo
 settings.event_create_desc=Branch, tai tagi luotu
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push repoon
 settings.active=Aktiivinen

conf/locale/locale_fr-FR.ini

@@ -96,8 +96,8 @@ offline_mode=Activer le mode hors connexion
 offline_mode_popup=Désactiver le CDN, même en production. Toutes les ressources seront distribuées en local.
 disable_gravatar=Désactiver le service Gravatar
 disable_gravatar_popup=Désactiver Gravatar et les sources personnalisées, tous les avatars sont téléchargés par les utilisateurs ou par défaut.
-federated_avatar_lookup=Enable Federated Avatars Lookup
-federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Activer les recherches d'avatars unifiés
+federated_avatar_lookup_popup=Activer la recherche unifiée d'avatars en utilisant le service open source unifié basé sur libravatar.
 disable_registration=Désactiver le formulaire d'inscription
 disable_registration_popup=Désactiver le formulaire d'inscription, seuls les administrateurs peuvent créer des comptes.
 enable_captcha=Activez le Captcha
@@ -189,6 +189,13 @@ TeamName=Nom d'équipe
 AuthName=Nom d'autorisation
 AdminEmail=E-mail de l'administrateur
 
+NewBranchName=Nouveau nom de la branche
+CommitSummary=Résumé du commit
+CommitMessage=Message de commit
+CommitChoice=Choix de commit
+TreeName=Chemin du fichier
+Content=Contenu
+
 require_error=` Ne peut être vide `
 alpha_dash_error=` doivent être des caractères alpha, numeriques ou console (-_) valides `
 alpha_dash_dot_error=` doivent être des caractères alpha, numeriques, console (-_) valides ou des points `
@@ -262,8 +269,8 @@ change_username_prompt=Cette modification affectera la manière dont les liens s
 continue=Continuer
 cancel=Annuler
 
-lookup_avatar_by_mail=Lookup Avatar by mail
-federated_avatar_lookup=Federated Avatar Lookup
+lookup_avatar_by_mail=Recherche d'avatar par email
+federated_avatar_lookup=Recherche d'avatars unifiés
 enable_custom_avatar=Activer l'avatar personnalisé
 choose_new_avatar=Sélectionner un nouvel avatar
 update_avatar=Mettre à jour l'avatar
@@ -350,7 +357,7 @@ fork_from=Fork de
 fork_visiblity_helper=La visibilité d'un fork ne peut pas être modifiée.
 repo_desc=Description
 repo_lang=Langue
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Choisissez un modèle de fichier .gitignore
 license=Licence
 license_helper=Sélectionner un fichier de licence
 readme=Fichier Readme
@@ -363,6 +370,7 @@ mirror_prune_desc=Supprimez toute référence de suivi à distance qui n'existe
 mirror_interval=Intervalle du miroir (heure)
 mirror_address=Adresse du miroir
 mirror_address_desc=Veuillez inclure les informations d'identification nécessaires dans l'adresse.
+mirror_last_synced=Dernière synchronisation
 watchers=Observateurs
 stargazers=Stargazers
 forks=Forks
@@ -419,6 +427,44 @@ file_view_raw=Voir le Raw
 file_permalink=Lien permanent
 file_too_large=Ce fichier est trop gros pour être afficher
 
+editor.new_file=Nouveau fichier
+editor.upload_file=Téléverser un fichier
+editor.edit_file=Modifier fichier
+editor.preview_changes=Aperçu des modifications
+editor.cannot_edit_non_text_files=Impossible de modifier les fichiers non-texte
+editor.edit_this_file=Modifier ce fichier
+editor.must_be_on_a_branch=Vous devez être sur une branche pour appliquer ou proposer des modifications à ce fichier
+editor.fork_before_edit=Vous devez fourcher ce dépôt avant de modifier le fichier
+editor.delete_this_file=Supprimer ce fichier
+editor.must_have_write_access=Vous devez avoir un accès en écriture pour appliquer ou proposer des modifications à ce fichier
+editor.file_delete_success=Fichier '%s' a été supprimé avec succès!
+editor.name_your_file=Nommez votre fichier...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=ou
+editor.cancel_lower=annuler
+editor.commit_changes=Commit les modifications
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Mettre à jour '%s'
+editor.delete=Supprimer '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=Nouveau nom de la branche...
+editor.cancel=Annuler
+editor.filename_cannot_be_empty=Nom de fichier ne peut pas être vide.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=Il n’y a aucun changement à afficher.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commits
 commits.search=Rechercher des commits
 commits.find=Trouver
@@ -432,18 +478,23 @@ issues.new=Nouveau ticket
 issues.new.labels=Etiquettes
 issues.new.no_label=Pas d'étiquette
 issues.new.clear_labels=Effacer les étiquettes
-issues.new.milestone=Étape
-issues.new.no_milestone=Pas d'étape
-issues.new.clear_milestone=Effacer l'étape
-issues.new.open_milestone=Ouvrir l'étape
+issues.new.milestone=Jalon
+issues.new.no_milestone=Aucun jalon
+issues.new.clear_milestone=Effacer le jalon
+issues.new.open_milestone=Ouvrir un jalon
 issues.new.closed_milestone=Jalons fermés
 issues.new.assignee=Affecté à
 issues.new.clear_assignee=Supprimer les assignataires
 issues.new.no_assignee=Pas d'assignataire
-issues.create=Créer un rapport de problème
+issues.create=Créer un ticket
 issues.new_label=Nouvelle étiquette
 issues.new_label_placeholder=Nom de l'étiquette...
 issues.create_label=Créer une étiquette
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d Ouvert
 issues.close_tab=%d Fermé
 issues.filter_label=Étiquette
@@ -485,8 +536,7 @@ issues.commit_ref_at=`a référencé ce problème à partir d'un commit <a id="%
 issues.poster=Publier
 issues.collaborator=Collaborateur
 issues.owner=Propriétaire
-issues.sign_up_for_free=Inscrivez-vous gratuitement
-issues.sign_in_require_desc=pour rejoindre cette conversation. Vous avez déjà un compte ? <a href="%s">Connectez-vous commenter</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Modifier
 issues.cancel=Annuler
 issues.save=Enregistrer
@@ -501,6 +551,8 @@ issues.label_deletion=Suppression du Label
 issues.label_deletion_desc=Cette opération supprimera également toutes les informations relatives aux tickets. Voulez-vous continuer ?
 issues.label_deletion_success=Label supprimé avec succès !
 issues.num_participants=%d Participants
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Nouvelle Pull Request
 pulls.compare_changes=Comparer les changements
@@ -580,17 +632,20 @@ settings.collaboration.undefined=Indéfini
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Paramètres de base
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Site officiel
 settings.update_settings=Valider
 settings.change_reponame_prompt=Ce changement affectera comment les liens sont reliés avec le dépôt.
 settings.advanced_settings=Paramètres avancés
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Activer le wiki
+settings.use_internal_wiki=Utiliser le wiki interne
 settings.use_external_wiki=Utiliser un wiki externe
 settings.external_wiki_url=URL Wiki externe
 settings.external_wiki_url_desc=Les visiteurs seront redirigés vers cette URL lorsqu'ils cliqueront sur l'onglet.
-settings.issues_desc=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Activer le système de tickets
+settings.use_internal_issue_tracker=Utiliser le système simplifié de tickets interne
 settings.use_external_issue_tracker=Utiliser un bug-tracker externe
 settings.tracker_url_format=Format d'URL du bug tracker
 settings.tracker_issue_style=Style de nommage des bugs du tracker externe :
@@ -665,6 +720,8 @@ settings.event_send_everything=J'ai besoin de <strong>tout</strong>.
 settings.event_choose=Permettez-moi de choisir ce dont j'ai besoin.
 settings.event_create=Créer
 settings.event_create_desc=Branche, ou Tag créé
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push vers un dépôt
 settings.active=Actif
@@ -1056,19 +1113,19 @@ config.cookie_life_time=Expiration du cookie
 config.picture_config=Configuration d'Image
 config.picture_service=Service d'Imagerie
 config.disable_gravatar=Désactiver Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Activer les avatars unifiés
 
-config.git_config=Git Configuration
-config.git_disable_diff_highlight=Disable Diff Syntax Highlight
-config.git_max_diff_lines=Max Diff Lines (for a single file)
-config.git_max_diff_line_characters=Max Diff Characters (for a single line)
-config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_migrate_timeout=Migration Timeout
-config.git_mirror_timeout=Mirror Update Timeout
-config.git_clone_timeout=Clone Operation Timeout
-config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_config=Configuration de Git
+config.git_disable_diff_highlight=Désactiver la surbrillance syntaxique de Diff
+config.git_max_diff_lines=Lignes de Diff Max (pour un seul fichier)
+config.git_max_diff_line_characters=Nombre max de caractères de Diff (pour une seule ligne)
+config.git_max_diff_files=Nombre max de fichiers de Diff (à afficher)
+config.git_gc_args=Arguments de GC
+config.git_migrate_timeout=Délai imparti pour une migration
+config.git_mirror_timeout=Délai imparti pour mettre à jour le miroir
+config.git_clone_timeout=Délai imparti pour l'opération "Clone"
+config.git_pull_timeout=Délai imparti pour l'opération "Pull"
+config.git_gc_timeout=Délai imparti pour l'opération "GC"
 
 config.log_config=Configuration du Journal
 config.log_mode=Mode du journal
@@ -1100,7 +1157,7 @@ notices.delete_success=Notifications système supprimées avec succès.
 
 [action]
 create_repo=a créé le dépôt <a href="%s">%s</a>
-rename_repo=rebaptisé le dépôt de <code>%[1]s</code> à <a href="%[2]s">%[3]s</a>
+rename_repo=a rebaptisé le dépôt de <code>%[1]s</code> vers <a href="%[2]s">%[3]s</a>
 commit_repo=a soumis à <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
 create_issue=`a ouvert un problème <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`tickets clos <a href="%s/issues/%s">%s#%[2]s</a>`
@@ -1115,23 +1172,23 @@ push_tag=a soumis le tag <a href="%s/src/%s">%[2]s</a> sur <a href="%[1]s">%[3]s
 compare_commits=Comparer ces %d commits
 
 [tool]
-ago=auparavant
-from_now=à partir de maintenant
+ago=il y a
+from_now=dans
 now=maintenant
-1s=1 seconde %s
-1m=1 minute %s
-1h=1 heure %s
-1d=1 jour %s
-1w=1 semaine %s
-1mon=1 mois %s
-1y=1 an %s
-seconds=%d secondes %s
-minutes=%d minutes %s
-hours=%d heures %s
-days=%d jours %s
-weeks=%d semaines %s
-months=%d mois %s
-years=%d ans %s
+1s=%s 1 seconde
+1m=%s 1 minute
+1h=%s 1 heure
+1d=%s 1 jour
+1w=%s 1 semaine
+1mon=%s 1 mois
+1y=%s 1 an
+seconds=%[2]s %[1]d secondes
+minutes=%[2]s %[1]d minutes
+hours=%[2]s %[1]d heures
+days=%[2]s %[1]d jours
+weeks=%[2]s %[1]d semaines
+months=%[2]s %[1]d mois
+years=%[2]s %[1]d ans
 raw_seconds=secondes
 raw_minutes=minutes
 

conf/locale/locale_it-IT.ini

@@ -189,6 +189,13 @@ TeamName=Nome Team
 AuthName=Nome autorizzazione
 AdminEmail=Email dell'Admin
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` non può essere vuoto.`
 alpha_dash_error=` ammessi solo caratteri alfanumerici o trattini(-_).`
 alpha_dash_dot_error=` ammessi solo caratteri alfanumerici o trattini(-_) o punti.`
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=Intervallo Mirror (in ore)
 mirror_address=Indirizzo del mirror
 mirror_address_desc=Si prega di includere nell'indirizzo le credenziali utente necessarie.
+mirror_last_synced=Last Synced
 watchers=Osservatori
 stargazers=Fan
 forks=Fork
@@ -419,6 +427,44 @@ file_view_raw=Vedi originale
 file_permalink=Permalink
 file_too_large=This file is too large to be shown
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commits
 commits.search=Ricerca una versione
 commits.find=Cerca
@@ -444,6 +490,11 @@ issues.create=Crea Problema
 issues.new_label=Nuova etichetta
 issues.new_label_placeholder=Nome dell'etichetta...
 issues.create_label=Crea Etichetta
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d Aperti
 issues.close_tab=%d Chiusi
 issues.filter_label=Etichetta
@@ -485,8 +536,7 @@ issues.commit_ref_at=`referenced this issue from a commit <a id="%[1]s" href="#%
 issues.poster=Autore
 issues.collaborator=Collaboratori
 issues.owner=Proprietario
-issues.sign_up_for_free=Registrati gratuitamente
-issues.sign_in_require_desc=per partecipare a questa conversazione. Possiedi già un account?<a href="%s">Fai il login per commentare</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Modifica
 issues.cancel=Annulla
 issues.save=Salva
@@ -501,6 +551,8 @@ issues.label_deletion=Elimina Etichetta
 issues.label_deletion_desc=Eliminare l'etichetta rimuovera le sue informazioni in tutti i problemi correlati. Vuoi continuare?
 issues.label_deletion_success=Etichetta eliminata con successo!
 issues.num_participants=%d Partecipanti
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Nuova Pull Request
 pulls.compare_changes=Confronta le modifiche
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Undefined
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Impostazioni di Base
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Sito Ufficiale
 settings.update_settings=Aggiorna Impostazioni
 settings.change_reponame_prompt=Questa modifica influirà i link al repository.
@@ -665,6 +720,8 @@ settings.event_send_everything=Ho bisogno di <strong>tutto</strong>.
 settings.event_choose=Lasciami scegliere ciò di cui ho bisogno.
 settings.event_create=Crea
 settings.event_create_desc=Branch, o tag creato
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push in un repository
 settings.active=Attivo

conf/locale/locale_ja-JP.ini

@@ -189,6 +189,13 @@ TeamName=チーム名
 AuthName=承認名
 AdminEmail=管理者の電子メール
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=空にできません
 alpha_dash_error=アルファベット、数字、ハイフン"-"、アンダースコア"_"のいずれかの必要があります
 alpha_dash_dot_error=' アルファベット、数値、ダッシュ(-)、アンダースコア(_) 、ドット(.)のいずれかを入力する必要があります。 '
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=ミラー 間隔(時)
 mirror_address=ミラー アドレス
 mirror_address_desc=Please include necessary user credentials in the address.
+mirror_last_synced=Last Synced
 watchers=ウォッチャー
 stargazers=Stargazers
 forks=フォーク
@@ -419,6 +427,44 @@ file_view_raw=Rawデータを見る
 file_permalink=パーマリンク
 file_too_large=このファイルは大きすぎるため、表示できません。
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=コミット
 commits.search=コミットの検索
 commits.find=検索
@@ -444,6 +490,11 @@ issues.create=問題を作成
 issues.new_label=新しいラベル
 issues.new_label_placeholder=ラベル名...
 issues.create_label=ラベルを作成
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d オープン
 issues.close_tab=%d クローズ
 issues.filter_label=ラベル
@@ -485,8 +536,7 @@ issues.commit_ref_at=`referenced this issue from a commit <a id="%[1]s" href="#%
 issues.poster=ポスター
 issues.collaborator=コラボレータ
 issues.owner=オーナー
-issues.sign_up_for_free=無料でサインアップ
-issues.sign_in_require_desc=to join this conversation. Already have an account? <a href="%s">Sign in to comment</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=編集
 issues.cancel=キャンセル
 issues.save=保存
@@ -501,6 +551,8 @@ issues.label_deletion=ラベルの削除
 issues.label_deletion_desc=ラベルを削除すると、関連するすべての問題の情報が削除されます。続行しますか。
 issues.label_deletion_success=ラベルは正常に削除されました。
 issues.num_participants=%d Participants
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=新しいプルリクエスト
 pulls.compare_changes=変更を比較
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Undefined
 settings.hooks=Webhooks
 settings.githooks=Git のフック
 settings.basic_settings=基本設定
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=公式サイト
 settings.update_settings=設定の更新
 settings.change_reponame_prompt=この変更はリンクがリポジトリに関連付ける方法に影響します。
@@ -665,6 +720,8 @@ settings.event_send_everything=<strong>すべて</strong> が必要です。
 settings.event_choose=必要なものを選択しましょう。
 settings.event_create=Create
 settings.event_create_desc=ブランチ、またはタグを作成
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=プッシュ
 settings.event_push_desc=Git リポジトリにプッシュ
 settings.active=アクティブ

conf/locale/locale_lv-LV.ini

@@ -189,6 +189,13 @@ TeamName=Komandas nosaukums
 AuthName=Autorizācijas nosaukums
 AdminEmail=Admin e-pasta adrese
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` nedrīkst būt tukšs.`
 alpha_dash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_).`
 alpha_dash_dot_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu.`
@@ -241,7 +248,7 @@ form.name_pattern_not_allowed=Lietotāja vārds '%s' nav atļauts.
 [settings]
 profile=Profils
 password=Parole
-avatar=Avatar
+avatar=Profila attēls
 ssh_keys=SSH atslēgas
 social=Sociālie konti
 applications=Lietotnes
@@ -363,6 +370,7 @@ mirror_prune_desc=Izdzēst visas ārējās atsauces, kas ārējā repozitorijā
 mirror_interval=Spoguļošanas intervāls (stundās)
 mirror_address=Spoguļa adrese
 mirror_address_desc=Lūdzu iekļaujiet adresē nepieciešamo lietotājvārdu/paroli.
+mirror_last_synced=Last Synced
 watchers=Novērotāji
 stargazers=Zvaigžņdevēji
 forks=Atdalītie repozitoriji
@@ -419,6 +427,44 @@ file_view_raw=Rādīt neapstrādātu
 file_permalink=Patstāvīgā saite
 file_too_large=Šis fails ir par lielu, lai to parādītu
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Revīzijas
 commits.search=Meklēt revīzijas
 commits.find=Meklēt
@@ -444,6 +490,11 @@ issues.create=Pieteikt problēmu
 issues.new_label=Jauna etiķete
 issues.new_label_placeholder=Etiķetes nosaukums...
 issues.create_label=Izveidot etiķeti
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d atvērti
 issues.close_tab=%d aizvērti
 issues.filter_label=Etiķete
@@ -485,8 +536,7 @@ issues.commit_ref_at=`pieminēja šo problēmu revīzijā <a id="%[1]s" href="#%
 issues.poster=Autors
 issues.collaborator=Līdzstrādnieks
 issues.owner=Īpašnieks
-issues.sign_up_for_free=Pievienojieties
-issues.sign_in_require_desc=, lai piedalītos diskusijā. Jau ir konts? <a href="%s">Pierakstieties, lai komentētu</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Labot
 issues.cancel=Atcelt
 issues.save=Saglabāt
@@ -501,6 +551,8 @@ issues.label_deletion=Etiķetes dzēšana
 issues.label_deletion_desc=Dzēšot šo etiķeti, tā tiks noņemta no visām saistītajām problēmām. Vai vēlaties turpināt?
 issues.label_deletion_success=Etiķete tika veiksmīgi izdzēsta!
 issues.num_participants=%d dalībnieki
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Jauns izmaiņu pieprasījums
 pulls.compare_changes=Salīdzināt izmaiņas
@@ -580,12 +632,15 @@ settings.collaboration.undefined=Nedefinētas
 settings.hooks=Tīmekļa āķi
 settings.githooks=Git āķi
 settings.basic_settings=Pamatiestatījumi
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Oficiālā mājas lapa
 settings.update_settings=Mainīt iestatījumus
 settings.change_reponame_prompt=Šī izmaiņa ietekmēs saites, kas ir saistītas ar šo repozitoriju.
 settings.advanced_settings=Papildu iestatījumi
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Iespējot vikivietnes
+settings.use_internal_wiki=Izmantot iebūvēto vikivietni
 settings.use_external_wiki=Izmantot ārējo vikivietni
 settings.external_wiki_url=Ārējās Vikivietnes adrese
 settings.external_wiki_url_desc=Apmeklētāji tiks novirzīti uz adresi, kad viņi uzklikšķinās uz cilnes.
@@ -665,6 +720,8 @@ settings.event_send_everything=Vēlos saņemt <strong>visu</strong>.
 settings.event_choose=Atzīmēt, ko vēlos saņemt.
 settings.event_create=Izveidot
 settings.event_create_desc=Atzara vai taga izveidošana
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Izmaiņu nosūtīšana
 settings.event_push_desc=Git izmaiņu nosūtīšana uz repozitoriju
 settings.active=Aktīvs
@@ -1058,17 +1115,17 @@ config.picture_service=Lokāli attēli
 config.disable_gravatar=Atspējot Gravatar
 config.enable_federated_avatar=Enable Federated Avatars
 
-config.git_config=Git Configuration
+config.git_config=Git konfigurācija
 config.git_disable_diff_highlight=Disable Diff Syntax Highlight
 config.git_max_diff_lines=Max Diff Lines (for a single file)
 config.git_max_diff_line_characters=Max Diff Characters (for a single line)
 config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_migrate_timeout=Migration Timeout
+config.git_gc_args=GC argumenti
+config.git_migrate_timeout=Migrācijas noilgums
 config.git_mirror_timeout=Mirror Update Timeout
 config.git_clone_timeout=Clone Operation Timeout
 config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_gc_timeout=GC darbības noilgums
 
 config.log_config=Žurnalizēšanas konfigurācija
 config.log_mode=Žurnalizēšanas veids

conf/locale/locale_nl-NL.ini

@@ -189,6 +189,13 @@ TeamName=Team naam
 AuthName=Autorisatienaam
 AdminEmail=E-mail beheerder
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=kan niet leeg zijn.
 alpha_dash_error=moet een valide alfanumeriek of dash(-_) karakter zijn.
 alpha_dash_dot_error=moet een valide alfanumeriek, dash(-_) of (.) punt karakter zijn.
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=Mirror interval(uur)
 mirror_address=Kopie-adres
 mirror_address_desc=Gelieve noodzakelijke gebruikersgegevens in de adresbalk.
+mirror_last_synced=Last Synced
 watchers=Volgers
 stargazers=Stargazers
 forks=Forks
@@ -419,6 +427,44 @@ file_view_raw=Weergave ruwe
 file_permalink=Permalink
 file_too_large=This file is too large to be shown
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commits
 commits.search=Zoeken
 commits.find=zoek
@@ -444,6 +490,11 @@ issues.create=Maak probleem
 issues.new_label=Nieuw Label
 issues.new_label_placeholder=Tekst label...
 issues.create_label=Maak label
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d Open
 issues.close_tab=%d gesloten
 issues.filter_label=Label
@@ -485,8 +536,7 @@ issues.commit_ref_at=`verwees naar dit probleem vanuit een commit <a id="%[1]s"
 issues.poster=Poster
 issues.collaborator=Medewerker
 issues.owner=Eigenaar
-issues.sign_up_for_free=Gratis aanmelden
-issues.sign_in_require_desc=om deel te nemen in deze conversatie. Heeft u al een account? <a href="%s">Meld u aan om te reageren</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Bewerken
 issues.cancel=Annuleren
 issues.save=Opslaan
@@ -501,6 +551,8 @@ issues.label_deletion=Verwijder label
 issues.label_deletion_desc=Het verwijderen van dit label zal alle informatie in de gerelateerde problemen verwijderen. Wilt u doorgaan?
 issues.label_deletion_success=Label werd met succes verwijderd!
 issues.num_participants=%d deelnemers
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Nieuwe Pull aanvraag
 pulls.compare_changes=Vergelijk veranderingen
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Undefined
 settings.hooks=Webhooks
 settings.githooks=Git-hooks
 settings.basic_settings=Basis instellingen
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Officiële site
 settings.update_settings=Instellingen bewerken
 settings.change_reponame_prompt=Deze verandering zal gevolgen hebben voor hoe links zich verhouden tot de repository.
@@ -665,6 +720,8 @@ settings.event_send_everything=Ik moet <strong>alles</strong> hebben.
 settings.event_choose=Laat me kiezen wat ik nodig heb.
 settings.event_create=Creëer
 settings.event_create_desc=Branch, of tag aangemaakt
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push naar een repository
 settings.active=Actief

conf/locale/locale_pl-PL.ini

@@ -189,6 +189,13 @@ TeamName=Nazwa zespołu
 AuthName=Nazwa autoryzacji
 AdminEmail=E-mail administratora
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` nie może być puste.`
 alpha_dash_error=` musi się składać z prawidłowych znaków alfanumerycznych, myślników oraz podkreśleń.`
 alpha_dash_dot_error=` musi się składać z prawidłowych znaków alfanumerycznych, myślników, podkreśleń oraz kropek.`
@@ -363,6 +370,7 @@ mirror_prune_desc=Usuń wszystkie śledzone odwołania które nie istnieją w zd
 mirror_interval=Częstotliwość kopiowania (godziny)
 mirror_address=Adres kopii lustrzanej
 mirror_address_desc=Proszę podać wymagane poświadczenia użytkownika w adresie.
+mirror_last_synced=Last Synced
 watchers=Obserwujący
 stargazers=Polubienia
 forks=Forki
@@ -419,6 +427,44 @@ file_view_raw=Zobacz czysty
 file_permalink=Bezpośredni odnośnik
 file_too_large=Ten plik jest zbyt duży, aby go wyświetlić
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commity
 commits.search=Przeszukaj commity
 commits.find=Szukaj
@@ -444,6 +490,11 @@ issues.create=Utwórz problem
 issues.new_label=Nowa etykieta
 issues.new_label_placeholder=Etykieta...
 issues.create_label=Utwórz etykietę
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=Otwarte %d
 issues.close_tab=Zamknięte %d
 issues.filter_label=Etykieta
@@ -485,8 +536,7 @@ issues.commit_ref_at=`wspomina ten problem w commicie <a id="%[1]s" href="#%[1]s
 issues.poster=Autor
 issues.collaborator=Współpracownik
 issues.owner=Właściciel
-issues.sign_up_for_free=Zarejestruj się za darmo
-issues.sign_in_require_desc=do przyłączenia się do tej rozmowy. Masz już konto? <a href="%s">Zaloguj się by komentować</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Edytuj
 issues.cancel=Anuluj
 issues.save=Zapisz
@@ -501,6 +551,8 @@ issues.label_deletion=Usunięcie etykiety
 issues.label_deletion_desc=Usunięcie tej etykiety spowoduje usuniecie jej ze wszystkich powiązanych problemów. Czy na pewno chcesz kontynuować?
 issues.label_deletion_success=Etykieta została usunięta pomyślnie!
 issues.num_participants=%d uczestników
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Nowy pull request
 pulls.compare_changes=Porównaj zmiany
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Niezdefiniowany
 settings.hooks=Webhooki
 settings.githooks=Hooki Git
 settings.basic_settings=Ustawienia podstawowe
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Oficjalna Strona
 settings.update_settings=Aktualizuj ustawienia
 settings.change_reponame_prompt=Zmiana nazwy repozytorium wpłynie na linki do niego.
@@ -665,6 +720,8 @@ settings.event_send_everything=Potrzebuję <strong>wszystkiego</strong>.
 settings.event_choose=Pozwól mi wybrać, czego potrzebuję.
 settings.event_create=Utwórz
 settings.event_create_desc=Utworzono gałąź lub tag
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Wypchnięcie
 settings.event_push_desc=Wypchnięcie (push) do repozytorium Git
 settings.active=Aktywny

conf/locale/locale_pt-BR.ini

@@ -78,7 +78,7 @@ ssh_port_helper=Número da porta que seu servidor SSH está usando, deixe vazio
 http_port=Porta HTTP
 http_port_helper=Número da porta em que a aplicação irá executar.
 app_url=URL do aplicativo
-app_url_helper=Isto afeta a URL de clonagem via HTTP/HTTPs e também o email.
+app_url_helper=Isto afeta a URL de clonagem via HTTP/HTTPs e também o e-mail.
 log_root_path=Caminho do log
 log_root_path_helper=Pasta dos arquivos de log.
 
@@ -96,8 +96,8 @@ offline_mode=Ativar modo off-line
 offline_mode_popup=Desative o CDN mesmo em modo de produção, todos os recursos serão disponibilizados localmente.
 disable_gravatar=Desativar serviço Gravatar
 disable_gravatar_popup=Desabilitar o Gravatar e fontes personalizadas, todos os avatares são enviados por usuários ou padrão.
-federated_avatar_lookup=Enable Federated Avatars Lookup
-federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Habilitar a busca federativa de avatares
+federated_avatar_lookup_popup=Habilitar a busca federativa de avatares a usar o serviço federativo de código aberto baseado no libravatar.
 disable_registration=Desativar auto-registro
 disable_registration_popup=Desativar o auto-registro de usuário, para que somente o administrador possa criar contas.
 enable_captcha=Habilitar captcha
@@ -189,6 +189,13 @@ TeamName=Nome da equipe
 AuthName=Nome de autorização
 AdminEmail=E-mail do Administrador
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` não pode estar vazio.`
 alpha_dash_error=` devem ser caracteres alfanuméricos ou hífen (-) ou sublinhado (_).`
 alpha_dash_dot_error=` devem ser caracteres alfanuméricos ou hífen (-) ou sublinhado (_).`
@@ -262,8 +269,8 @@ change_username_prompt=Essa alteração afetará os links para a sua conta.
 continue=Continuar
 cancel=Cancelar
 
-lookup_avatar_by_mail=Lookup Avatar by mail
-federated_avatar_lookup=Federated Avatar Lookup
+lookup_avatar_by_mail=Busca de avatar por e-mail
+federated_avatar_lookup=Busca de avatar federativo
 enable_custom_avatar=Habilitar Avatar Customizado
 choose_new_avatar=Escolha um novo avatar
 update_avatar=Atualizar configuração de Avatar
@@ -350,7 +357,7 @@ fork_from=Fork de
 fork_visiblity_helper=Não é possível alterar a visibilidade de um repositório forkado.
 repo_desc=Descrição
 repo_lang=Linguagem
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Selecionar templates de .gitignore
 license=Licença
 license_helper=Selecione um arquivo de licença
 readme=Leia-me
@@ -363,6 +370,7 @@ mirror_prune_desc=Remova quaisquer referências que não existem mais no remote
 mirror_interval=Intervalo de Espelho (hora)
 mirror_address=Endereço do espelho
 mirror_address_desc=Por favor, inclua as credenciais do usuário necessários no endereço.
+mirror_last_synced=Last Synced
 watchers=Observadores
 stargazers=Usuários que estrelaram
 forks=Forks
@@ -419,6 +427,44 @@ file_view_raw=Ver cru
 file_permalink=Link permanente
 file_too_large=Este arquivo é muito grande para ser exibido
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=Commits
 commits.search=Pesquisar commits
 commits.find=Buscar
@@ -444,6 +490,11 @@ issues.create=Salvar
 issues.new_label=Nova etiqueta
 issues.new_label_placeholder=Nome da etiqueta...
 issues.create_label=Salvar
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d aberto
 issues.close_tab=%d fechados
 issues.filter_label=Etiqueta
@@ -485,8 +536,7 @@ issues.commit_ref_at=`citou este problema em um commit <a id="%[1]s" href="#%[1]
 issues.poster=Autor
 issues.collaborator=Colaboradores
 issues.owner=Proprietário
-issues.sign_up_for_free=Cadastre-se gratuitamente
-issues.sign_in_require_desc=para participar nesta conversa. Já tem uma conta? <a href="%s">Faça login para comentar</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Editar
 issues.cancel=Cancelar
 issues.save=Salvar
@@ -501,6 +551,8 @@ issues.label_deletion=Exclusão de etiqueta
 issues.label_deletion_desc=Excluir uma etiqueta a retirará de todos os problemas que ela estiver marcando. Quer mesmo continuar?
 issues.label_deletion_success=A etiqueta foi excluída com sucesso!
 issues.num_participants=%d participantes
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Novo Pull Request
 pulls.compare_changes=Comparar mudanças
@@ -580,17 +632,20 @@ settings.collaboration.undefined=Indefinido
 settings.hooks=Webhooks
 settings.githooks=Hooks do Git
 settings.basic_settings=Configurações Básicas
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Site Oficial
 settings.update_settings=Atualizar configurações
 settings.change_reponame_prompt=Este mudanças vai afetar os links para este repositório.
 settings.advanced_settings=Configurações avançadas
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Habilitar sistema de wiki
+settings.use_internal_wiki=Usar wiki nativa
 settings.use_external_wiki=Usar wiki externa
 settings.external_wiki_url=URL externa da wiki
 settings.external_wiki_url_desc=Os visitantes serão redirecionados para a URL quando clicarem na aba.
-settings.issues_desc=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Habilitar issue tracker
+settings.use_internal_issue_tracker=Usar o issue tracker nativo
 settings.use_external_issue_tracker=Usar issue tracker externo
 settings.tracker_url_format=Formato de URL do issue tracker externo
 settings.tracker_issue_style=Estilo de nome de issue tracker externo:
@@ -665,6 +720,8 @@ settings.event_send_everything=Preciso de <strong>tudo</strong>.
 settings.event_choose=Deixe-me escolher o que eu preciso.
 settings.event_create=Criar
 settings.event_create_desc=Branch ou Tag criado
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Git push para o repositório
 settings.active=Ativar
@@ -1056,19 +1113,19 @@ config.cookie_life_time=Tempo de Vida do Cookie
 config.picture_config=Configuração da Imagem
 config.picture_service=Serviço de Imagens
 config.disable_gravatar=Desativar Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Habilitar avatares federativos
 
-config.git_config=Git Configuration
-config.git_disable_diff_highlight=Disable Diff Syntax Highlight
-config.git_max_diff_lines=Max Diff Lines (for a single file)
-config.git_max_diff_line_characters=Max Diff Characters (for a single line)
-config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_migrate_timeout=Migration Timeout
-config.git_mirror_timeout=Mirror Update Timeout
-config.git_clone_timeout=Clone Operation Timeout
-config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_config=Configuração do Git
+config.git_disable_diff_highlight=Habilitar realce de mudanças no diff
+config.git_max_diff_lines=Máximo de linhas mostradas no diff (para um único arquivo)
+config.git_max_diff_line_characters=Máximo de caracteres mostrados no diff (para uma única linha)
+config.git_max_diff_files=Máximo de arquivos a serem mostrados no diff
+config.git_gc_args=Argumentos do coletor de lixo
+config.git_migrate_timeout=Timeout de migração
+config.git_mirror_timeout=Timeout para sincronização de espelho
+config.git_clone_timeout=Timeout para operação de clone
+config.git_pull_timeout=Timeout para operação de pull
+config.git_gc_timeout=Timeout para execução do coletor de lixo
 
 config.log_config=Configuração de Log
 config.log_mode=Modo do Log

conf/locale/locale_ru-RU.ini

@@ -126,7 +126,7 @@ uname_holder=Имя пользователь или E-mail
 password_holder=Пароль
 switch_dashboard_context=Переключить контекст панели управления
 my_repos=Мои репозитории
-show_more_repos=Show more repositories...
+show_more_repos=Показать больше репозиториев...
 collaborative_repos=Совместные репозитории
 my_orgs=Мои организации
 my_mirrors=Мои зеркала
@@ -151,8 +151,8 @@ forget_password=Забыли пароль?
 sign_up_now=Нужен аккаунт? Зарегистрируйтесь.
 confirmation_mail_sent_prompt=Новое письмо для подтверждения было направлено на <b>%s</b>, пожалуйста, проверьте ваш почтовый ящик в течение %d часов для завершения регистрации.
 active_your_account=Активируйте свой аккаунт
-prohibit_login=Login Prohibited
-prohibit_login_desc=Your account is prohibited to login, please contact site admin.
+prohibit_login=Вход запрещен
+prohibit_login_desc=Вход для вашей учетной записи был запрещен, пожалуйста, свяжитесь с администратором сайта.
 resent_limit_prompt=Извините, вы уже запросили активацию по электронной почте недавно. Пожалуйста, подождите 3 минуты, а затем повторите попытку.
 has_unconfirmed_mail=Здравствуйте, %s! У вас есть неподтвержденный адрес электронной почты (<b>%s</b>). Если вам не приходило письмо с подтверждением или нужно выслать новое письмо, нажмите на кнопку ниже.
 resend_mail=Нажмите здесь, чтобы переотправить активационное письмо
@@ -189,6 +189,13 @@ TeamName=Название команды
 AuthName=Имя авторизации
 AdminEmail=Электронная почта администратора
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` не может быть пустым.`
 alpha_dash_error=«должен быть допустимым символьным, числовым или dash(-_) значением.»
 alpha_dash_dot_error=«должен быть допустимым символьным, числовым или dash(-_) символами, включая точку.»
@@ -241,7 +248,7 @@ form.name_pattern_not_allowed=Имя пользователя «%s» не доп
 [settings]
 profile=Профиль
 password=Пароль
-avatar=Avatar
+avatar=Аватар
 ssh_keys=SSH ключи
 social=Учетные записи в соцсетях
 applications=Приложения
@@ -350,7 +357,7 @@ fork_from=Ответвление от
 fork_visiblity_helper=Ответвленному репозиторию нельзя поменять уровень видимости
 repo_desc=Описание
 repo_lang=Язык
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Выберите шаблоны .gitignore
 license=Лицензия
 license_helper=Выберите файл лицензии
 readme=Readme
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=Интервал зеркалирования (час)
 mirror_address=Адрес зеркала
 mirror_address_desc=Укажите необходимые учетные данные в адрес.
+mirror_last_synced=Last Synced
 watchers=Наблюдатели
 stargazers=Звездочеты
 forks=Ответвления
@@ -417,7 +425,45 @@ file_raw=Исходник
 file_history=История
 file_view_raw=Посмотреть исходник
 file_permalink=Постоянная ссылка
-file_too_large=This file is too large to be shown
+file_too_large=Этот файл слишком большой, поэтому он не может быть отображен
+
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
 
 commits.commits=Коммиты
 commits.search=Поиск коммитов
@@ -444,6 +490,11 @@ issues.create=Добавить задачу
 issues.new_label=Новая метка
 issues.new_label_placeholder=Имя метки...
 issues.create_label=Добавить метку
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d открыто(ы)
 issues.close_tab=%d закрыто(ы)
 issues.filter_label=Метка
@@ -472,7 +523,7 @@ issues.open_title=Открыто
 issues.closed_title=Закрыто
 issues.num_comments=комментариев: %d
 issues.commented_at=`commented <a href="#%s">%s</a>`
-issues.delete_comment_confirm=Are you sure you want to delete this comment?
+issues.delete_comment_confirm=Вы уверены, что хотите удалить этот комментарий?
 issues.no_content=Пока нет содержимого.
 issues.close_issue=Закрыть
 issues.close_comment_issue=Прокомментировать и закрыть
@@ -485,8 +536,7 @@ issues.commit_ref_at=`упомянул эту задачу в коммите <a
 issues.poster=Автор
 issues.collaborator=Соавтор
 issues.owner=Владелец
-issues.sign_up_for_free=Зарегистрируйтесь бесплатно
-issues.sign_in_require_desc=чтобы присоединиться к обсуждению. Уже есть аккаунт? <a href="%s">Войдите чтобы прокомментировать</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Изменить
 issues.cancel=Отмена
 issues.save=Сохранить
@@ -501,6 +551,8 @@ issues.label_deletion=Удаление метки
 issues.label_deletion_desc=Удаление ярлыка затронет все связанные задачи. Продолжить?
 issues.label_deletion_success=Метка была удалена успешно!
 issues.num_participants=%d участников
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Новый запрос на слияние
 pulls.compare_changes=Сравнить изменения
@@ -580,22 +632,25 @@ settings.collaboration.undefined=Не определено
 settings.hooks=Автоматическое обновление
 settings.githooks=Git хуки
 settings.basic_settings=Основные параметры
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Официальный сайт
 settings.update_settings=Обновить настройки
 settings.change_reponame_prompt=Это изменение повлияет на отношения ссылок к этому репозиторию.
 settings.advanced_settings=Расширенные настройки
-settings.wiki_desc=Enable wiki system
-settings.use_internal_wiki=Use builtin wiki
+settings.wiki_desc=Включить систему Wiki
+settings.use_internal_wiki=Использовать встроенную wiki
 settings.use_external_wiki=Использовать внешнюю Wiki
 settings.external_wiki_url=URL-адрес внешней Вики
 settings.external_wiki_url_desc=Посетители будут перенаправлены на URL-адрес, когда они кликнут по вкладке.
-settings.issues_desc=Enable issue tracker
-settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.issues_desc=Включить систему отслеживания ошибок
+settings.use_internal_issue_tracker=Использовать встроенную легковесную систему отслеживания ошибок
 settings.use_external_issue_tracker=Использовать внешнюю систему отслеживания ошибок
 settings.tracker_url_format=Внешний формат ссылки системы отслеживания ошибок.
 settings.tracker_issue_style=Стиль Именования Внешней Системы Учета Задач:
-settings.tracker_issue_style.numeric=Numeric
-settings.tracker_issue_style.alphanumeric=Alphanumeric
+settings.tracker_issue_style.numeric=Цифровой
+settings.tracker_issue_style.alphanumeric=Буквенноцифровой
 settings.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера задачи.
 settings.pulls_desc=Включить публичные запросы на слияние
 settings.danger_zone=Опасная зона
@@ -665,6 +720,8 @@ settings.event_send_everything=Мне нужно <strong>все</strong>.
 settings.event_choose=Позвольте мне выбрать то, что нужно.
 settings.event_create=Создать
 settings.event_create_desc=Ветка или тэг созданы
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Push в репозиторий
 settings.active=Активен
@@ -702,8 +759,8 @@ diff.show_unified_view=Единый вид
 diff.stats_desc=<strong> %d измененных файлов</strong> с <strong>%d добавлено</strong> и <strong>%d удалено</strong>
 diff.bin=BIN
 diff.view_file=Просмотреть файл
-diff.file_suppressed=File diff suppressed because it is too large
-diff.too_many_files=Некоторые файлы не были показать из-за большого количества измененных файлов
+diff.file_suppressed=Разница между файлами не показана из-за своего большого размера
+diff.too_many_files=Некоторые файлы не были показаны из-за большого количества измененных файлов
 
 release.releases=Релизы
 release.new_release=Новый релиз
@@ -734,7 +791,7 @@ release.deletion=Удаление релиза
 release.deletion_desc=Удаление этого релиза удалит соответствующую Git метку. Вы хотите продолжить?
 release.deletion_success=Релиз был успешно удален!
 release.tag_name_already_exist=Релиз с этим именем метки уже существует.
-release.tag_name_invalid=Tag name is not valid.
+release.tag_name_invalid=Имя тега является не допустимым.
 release.downloads=Загрузки
 
 [org]
@@ -902,7 +959,7 @@ users.edit_account=Изменение учетной записи
 users.max_repo_creation=Ограничение максимального количества создаваемых репозиториев
 users.max_repo_creation_desc=(Установить -1 для использования стандартного глобального значения предела)
 users.is_activated=Эта учетная запись активирована
-users.prohibit_login=This account is prohibited to login
+users.prohibit_login=Вход с данной учетной записи запрещен
 users.is_admin=У этой учетной записи есть права администратора
 users.allow_git_hook=Пользователь имеет право создать Git перехватчик
 users.allow_import_local=Пользователь имеет право импортировать локальные репозитории
@@ -1058,17 +1115,17 @@ config.picture_service=Сервис изображений
 config.disable_gravatar=Отключить Gravatar
 config.enable_federated_avatar=Enable Federated Avatars
 
-config.git_config=Git Configuration
+config.git_config=Конфигурация GIT
 config.git_disable_diff_highlight=Disable Diff Syntax Highlight
 config.git_max_diff_lines=Max Diff Lines (for a single file)
 config.git_max_diff_line_characters=Max Diff Characters (for a single line)
 config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
-config.git_migrate_timeout=Migration Timeout
-config.git_mirror_timeout=Mirror Update Timeout
-config.git_clone_timeout=Clone Operation Timeout
-config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_gc_args=Аргументы GC
+config.git_migrate_timeout=Тайм-аут миграции
+config.git_mirror_timeout=Время Ожидания Обновления Зеркала
+config.git_clone_timeout=Время Ожидания Операции Клонирования
+config.git_pull_timeout=Время Ожидания Операции Извлечения
+config.git_gc_timeout=Время Ожидания Операции Сборки Мусора
 
 config.log_config=Конфигурация журнала
 config.log_mode=Режим журналирования

conf/locale/locale_tr-TR.ini

@@ -189,6 +189,13 @@ TeamName=Takım ismi
 AuthName=Yetkilendirme adı
 AdminEmail=Yönetici e-postası
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=` boş olamaz.`
 alpha_dash_error=` sadece karakter, rakam veya çizgi(-_) içermelidir.`
 alpha_dash_dot_error=` sadece karakter, rakam, çizgi(-_) veya nokta içermelidir.`
@@ -363,6 +370,7 @@ mirror_prune_desc=Uzakta olmayan bütün uzaktan-izleme referanslarını sil
 mirror_interval=Yansı Aralığı (saat)
 mirror_address=Yansı Adresi
 mirror_address_desc=Lütfen gerekli kimlik bilgilerini adreste bulundurun.
+mirror_last_synced=Last Synced
 watchers=İzleyenler
 stargazers=Yıldızlayanlar
 forks=Çatallamalar
@@ -419,6 +427,44 @@ file_view_raw=Ham Görünüm
 file_permalink=Kalıcı Bağlantı
 file_too_large=Bu dosya sergilenmek için çok büyük
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=İşlemeler
 commits.search=İşleme Arama
 commits.find=Bul
@@ -444,6 +490,11 @@ issues.create=Sorun Oluştur
 issues.new_label=Yeni Etiket
 issues.new_label_placeholder=Etiket adı...
 issues.create_label=Etiket Oluştur
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d açık
 issues.close_tab=%d kapanmış
 issues.filter_label=Etiket
@@ -485,8 +536,7 @@ issues.commit_ref_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> işlemesinde bu soru
 issues.poster=Poster
 issues.collaborator=Katkıcı
 issues.owner=Sahibi
-issues.sign_up_for_free=Ücretsiz Kaydolun
-issues.sign_in_require_desc=bu konuşmaya katılmak için. Zaten bir hesabınız var mı? <a href="%s">Yorum yapmak için giriş yapın</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=Düzenle
 issues.cancel=İptal
 issues.save=Kaydet
@@ -501,6 +551,8 @@ issues.label_deletion=Etiket Silme
 issues.label_deletion_desc=Bu etiketi silerseniz, bu etikete iliştirilmiş sorunlardaki tüm bilgiler de silinecektir. Devam etmek istiyor musunuz?
 issues.label_deletion_success=Etiket başarıyla silindi!
 issues.num_participants=%d Katılımcı
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=Yeni Değişiklik İsteği
 pulls.compare_changes=Değişiklikleri Karşılaştır
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Belirsiz
 settings.hooks=Web İstekleri
 settings.githooks=Git İstekleri
 settings.basic_settings=Temel Ayarlar
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=Resmi Web Sitesi
 settings.update_settings=Ayarları Güncelle
 settings.change_reponame_prompt=Bu değişiklik, bağlantıların depoyla olan ilişkisini etkileyecektir.
@@ -665,6 +720,8 @@ settings.event_send_everything=<strong>Her şeye</strong> ihtiyacım var.
 settings.event_choose=Neye ihtiyacım olduğunu seçtir.
 settings.event_create=Oluştur
 settings.event_create_desc=Dal veya biçim imi oluşturuldu
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=Push
 settings.event_push_desc=Bir depoya git push
 settings.active=Aktif

conf/locale/locale_zh-CN.ini

@@ -189,6 +189,13 @@ TeamName=团队名称
 AuthName=认证名称
 AdminEmail=管理员邮箱
 
+NewBranchName=新的分支名称
+CommitSummary=提交小结
+CommitMessage=提交消息
+CommitChoice=提交选择
+TreeName=文件路径
+Content=内容
+
 require_error=不能为空。
 alpha_dash_error=必须为英文字母、阿拉伯数字或横线（-_）。
 alpha_dash_dot_error=必须为英文字母、阿拉伯数字、横线（-_）或点。
@@ -363,6 +370,7 @@ mirror_prune_desc=当远程追踪的引用被删除时本地也同步删除
 mirror_interval=镜像同步周期（小时）
 mirror_address=镜像地址
 mirror_address_desc=请在镜像地址中写入必要的用户凭据信息。
+mirror_last_synced=上次同步时间：
 watchers=关注者
 stargazers=称赞者
 forks=派生仓库
@@ -419,6 +427,44 @@ file_view_raw=查看原始文件
 file_permalink=永久链接
 file_too_large=文件过大导致无法显示
 
+editor.new_file=新的文件
+editor.upload_file=上传文件
+editor.edit_file=编辑文件
+editor.preview_changes=预览变更
+editor.cannot_edit_non_text_files=无法编辑非文本文件
+editor.edit_this_file=编辑此文件
+editor.must_be_on_a_branch=您必须在某个分支上才能对此文件进行修改操作
+editor.fork_before_edit=您必须派生此仓库才能对此文件进行修改操作
+editor.delete_this_file=删除此文件
+editor.must_have_write_access=您必须具有可写权限才能对此文件进行修改操作
+editor.file_delete_success=文件 '%s' 删除成功！
+editor.name_your_file=命名文件...
+editor.filename_help=输入名称后按下 / 键即可添加目录，或将光标移至输入框最左侧按下退格键移除目录。
+editor.or=或
+editor.cancel_lower=取消
+editor.commit_changes=提交变更
+editor.add_tmpl=添加 '%s/<文件名>'
+editor.add=添加 '%s'
+editor.update=更新 '%s'
+editor.delete=删除 '%s'
+editor.commit_message_desc=添加一个可选的扩展描述...
+editor.commit_directly_to_this_branch=直接提交至 <strong class="branch-name">%s</strong> 分支。
+editor.create_new_branch=为此提交创建一个 <strong>新的分支</strong> 并发起合并请求。
+editor.new_branch_name_desc=新的分支名称...
+editor.cancel=取消
+editor.filename_cannot_be_empty=文件名不能为空。
+editor.branch_already_exists=此仓库已存在名为 '%s' 的分支。
+editor.directory_is_a_file=路径 '%s' 的父路径中包含此仓库已存在的文件名。
+editor.filename_is_a_directory=文件名 '%s' 是此仓库中已存在的目录名。
+editor.file_editing_no_longer_exists=您编辑的文件 '%s' 已经不存在于此仓库中。
+editor.file_changed_while_editing=文件内容在您进行编辑时已经发生变动。<a target="_blank" href="%s">单击此处</a> 查看变动的具体内容，或者 <strong>再次提交</strong> 覆盖已发生的变动。
+editor.file_already_exists=此仓库已经存在名为 '%s' 的文件。
+editor.no_changes_to_show=没有可以显示的变更。
+editor.fail_to_update_file=更新/创建文件 '%s' 时发生错误：%v
+editor.add_subdir=添加子目录...
+editor.unable_to_upload_files=上传文件至 '%s' 时发生错误：%v
+editor.upload_files_to_dir=上传文件至 '%s'
+
 commits.commits=次代码提交
 commits.search=搜索提交历史
 commits.find=查找
@@ -444,6 +490,11 @@ issues.create=创建工单
 issues.new_label=创建标签
 issues.new_label_placeholder=标签名称...
 issues.create_label=创建标签
+issues.label_templates.title=加载预定义的标签模板
+issues.label_templates.info=此仓库还未创建任何标签，您可以通过上方的 "创建标签" 创建一个新的标签或加载一组预定义的标签。
+issues.label_templates.helper=选择标签模板
+issues.label_templates.use=加载标签模板
+issues.label_templates.fail_to_load_file=加载标签模板文件 '%s' 时发生错误：%v
 issues.open_tab=%d 个开启中
 issues.close_tab=%d 个已关闭
 issues.filter_label=标签筛选
@@ -485,8 +536,7 @@ issues.commit_ref_at=`在代码提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中
 issues.poster=发布者
 issues.collaborator=协作者
 issues.owner=所有者
-issues.sign_up_for_free=免费注册
-issues.sign_in_require_desc=并加入到对话中来。如果您已经注册，可以直接 <a href="%s">登录并评论</a>
+issues.sign_in_require_desc=<a href="%s">登陆</a> 并参与到对话中。
 issues.edit=编辑
 issues.cancel=取消
 issues.save=保存
@@ -501,6 +551,8 @@ issues.label_deletion=删除标签操作
 issues.label_deletion_desc=删除该标签将会移除所有工单中相关的信息。是否继续？
 issues.label_deletion_success=标签删除成功！
 issues.num_participants=%d 名参与者
+issues.attachment.open_tab=`在新的标签页中查看 '%s'`
+issues.attachment.download=`点击下载 '%s'`
 
 pulls.new=创建合并请求
 pulls.compare_changes=对比文件变化
@@ -580,6 +632,9 @@ settings.collaboration.undefined=未定义
 settings.hooks=管理 Web 钩子
 settings.githooks=管理 Git 钩子
 settings.basic_settings=基本设置
+settings.mirror_settings=镜像设置
+settings.sync_mirror=立即同步
+settings.mirror_sync_in_progress=镜像同步请求已经生效，请稍后刷新页面。
 settings.site=官方网站
 settings.update_settings=更新仓库设置
 settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接
@@ -665,6 +720,8 @@ settings.event_send_everything=请把 <strong>一切</strong> 都给我
 settings.event_choose=我的命运自己主宰
 settings.event_create=创建
 settings.event_create_desc=创建分支或标签
+settings.event_pull_request=合并请求
+settings.event_pull_request_desc=开启、关闭、重新开启、编辑、指派、取消指派、更新标签、清除标签或同步合并请求
 settings.event_push=推送
 settings.event_push_desc=Git 仓库推送
 settings.active=是否激活

conf/locale/locale_zh-HK.ini

@@ -189,6 +189,13 @@ TeamName=團隊名稱
 AuthName=認證名稱
 AdminEmail=管理員郵箱
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=不能為空。
 alpha_dash_error=必須為英文字母、阿拉伯數字或橫線（-_）。
 alpha_dash_dot_error=必須為英文字母、阿拉伯數字、橫線（-_）或點。
@@ -363,6 +370,7 @@ mirror_prune_desc=Remove any remote-tracking references that no longer exist on
 mirror_interval=鏡像同步周期（小時）
 mirror_address=鏡像地址
 mirror_address_desc=請在位址中包括必要的使用者憑據。
+mirror_last_synced=Last Synced
 watchers=關注者
 stargazers=稱讚者
 forks=派生倉庫
@@ -419,6 +427,44 @@ file_view_raw=查看原始文件
 file_permalink=永久連結
 file_too_large=This file is too large to be shown
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=次代碼提交
 commits.search=搜索提交歷史
 commits.find=查找
@@ -444,6 +490,11 @@ issues.create=創建問題
 issues.new_label=創建標籤
 issues.new_label_placeholder=標籤名稱...
 issues.create_label=創建標籤
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d 個開啓中
 issues.close_tab=%d 個已關閉
 issues.filter_label=標籤篩選
@@ -485,8 +536,7 @@ issues.commit_ref_at=`在代碼提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中
 issues.poster=發佈者
 issues.collaborator=協同者
 issues.owner=所有者
-issues.sign_up_for_free=免費註冊
-issues.sign_in_require_desc=及加入到對話當中。如果您已經註冊，可以直接 <a href="%s">登錄及評論</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=編輯
 issues.cancel=取消
 issues.save=保存
@@ -501,6 +551,8 @@ issues.label_deletion=刪除標籤
 issues.label_deletion_desc=刪除該標籤將會移除所有問題中相關的訊息。是否繼續？
 issues.label_deletion_success=標籤刪除成功!
 issues.num_participants=%d 參與者
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=創建合併請求
 pulls.compare_changes=對比文件變化
@@ -580,6 +632,9 @@ settings.collaboration.undefined=Undefined
 settings.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=官方網站
 settings.update_settings=更新倉庫設置
 settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關的鏈接
@@ -665,6 +720,8 @@ settings.event_send_everything=推送 <strong>所有</strong> 事件
 settings.event_choose=讓我選擇我的需要
 settings.event_create=創建
 settings.event_create_desc=創建分支或標籤
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=推送
 settings.event_push_desc=Git 倉庫推送
 settings.active=是否激活

conf/locale/locale_zh-TW.ini

@@ -189,6 +189,13 @@ TeamName=團隊名稱
 AuthName=認證名稱
 AdminEmail=管理員郵箱
 
+NewBranchName=New branch name
+CommitSummary=Commit summary
+CommitMessage=Commit message
+CommitChoice=Commit choice
+TreeName=File path
+Content=Content
+
 require_error=不能為空。
 alpha_dash_error=必須為英文字母、阿拉伯數字或橫線（-_）。
 alpha_dash_dot_error=必須為英文字母、阿拉伯數字、橫線（-_）或點。
@@ -363,6 +370,7 @@ mirror_prune_desc=當遠程追蹤的引用被刪除時本地也會同步刪除
 mirror_interval=鏡像同步周期（小時）
 mirror_address=鏡像地址
 mirror_address_desc=請在位址中包括必要的使用者憑據。
+mirror_last_synced=Last Synced
 watchers=關注者
 stargazers=稱讚者
 forks=派生倉庫
@@ -419,6 +427,44 @@ file_view_raw=查看原始文件
 file_permalink=永久連結
 file_too_large=This file is too large to be shown
 
+editor.new_file=New file
+editor.upload_file=Upload file
+editor.edit_file=Edit file
+editor.preview_changes=Preview Changes
+editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.edit_this_file=Edit this file
+editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
+editor.fork_before_edit=You must fork this repository before editing the file
+editor.delete_this_file=Delete this file
+editor.must_have_write_access=You must have write access to make or propose changes to this file
+editor.file_delete_success=File '%s' has been deleted successfully!
+editor.name_your_file=Name your file...
+editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.or=or
+editor.cancel_lower=cancel
+editor.commit_changes=Commit Changes
+editor.add_tmpl=Add '%s/<filename>'
+editor.add=Add '%s'
+editor.update=Update '%s'
+editor.delete=Delete '%s'
+editor.commit_message_desc=Add an optional extended description...
+editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.new_branch_name_desc=New branch name...
+editor.cancel=Cancel
+editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.branch_already_exists=Branch '%s' already exists in this repository.
+editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists=A file with name '%s' already exists in this repository.
+editor.no_changes_to_show=There are no changes to show.
+editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
+editor.add_subdir=Add subdirectory...
+editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
+editor.upload_files_to_dir=Upload files to '%s'
+
 commits.commits=次代碼提交
 commits.search=搜索提交歷史
 commits.find=查找
@@ -444,6 +490,11 @@ issues.create=創建問題
 issues.new_label=創建標籤
 issues.new_label_placeholder=標籤名稱...
 issues.create_label=創建標籤
+issues.label_templates.title=Load a predefined set of labels
+issues.label_templates.info=There aren’t any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+issues.label_templates.helper=Select a label set
+issues.label_templates.use=Use this label set
+issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
 issues.open_tab=%d 個開啓中
 issues.close_tab=%d 個已關閉
 issues.filter_label=標籤篩選
@@ -485,8 +536,7 @@ issues.commit_ref_at=`在代碼提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中
 issues.poster=發佈者
 issues.collaborator=協同者
 issues.owner=所有者
-issues.sign_up_for_free=免費註冊
-issues.sign_in_require_desc=及加入到對話當中。如果您已經註冊，可以直接 <a href="%s">登錄及評論</a>
+issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
 issues.edit=編輯
 issues.cancel=取消
 issues.save=保存
@@ -501,6 +551,8 @@ issues.label_deletion=刪除標籤
 issues.label_deletion_desc=刪除該標籤將會移除所有問題中相關的訊息。是否繼續？
 issues.label_deletion_success=標籤刪除成功!
 issues.num_participants=%d 參與者
+issues.attachment.open_tab=`Click to see "%s" in a new tab`
+issues.attachment.download=`Click to download "%s"`
 
 pulls.new=創建合併請求
 pulls.compare_changes=對比文件變化
@@ -580,6 +632,9 @@ settings.collaboration.undefined=未定義
 settings.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
+settings.mirror_settings=Mirror Settings
+settings.sync_mirror=Sync Now
+settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
 settings.site=官方網站
 settings.update_settings=更新倉庫設置
 settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關的鏈接
@@ -665,6 +720,8 @@ settings.event_send_everything=推送 <strong>所有</strong> 事件
 settings.event_choose=讓我選擇我的需要
 settings.event_create=創建
 settings.event_create_desc=創建分支或標籤
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push=推送
 settings.event_push_desc=Git 倉庫推送
 settings.active=是否激活

glide.lock

@@ -5,7 +5,7 @@ imports:
   version: fb1f79c6b65acda83063cbc69f6bba1522558bfc
   subpackages:
   - memcache
-- name: github.com/codegangsta/cli
+- name: github.com/urfave/cli
   version: 1efa31f08b9333f1bd4882d61f9d668a70cd902e
 - name: github.com/go-macaron/binding
   version: 9440f336b443056c90d7d448a0a55ad8c7599880
@@ -41,9 +41,9 @@ imports:
 - name: github.com/gogits/cron
   version: 7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c
 - name: github.com/gogits/git-module
-  version: 18dd87dc5eac9ee7076133c8363803f2192d5713
+  version: 5e0c1330d7853d1affbc193885d517db0f8d1ca5
 - name: github.com/gogits/go-gogs-client
-  version: d1020b4da5474f7533f5b11084dcfd5536cf2e71
+  version: c52f7ee0cc58d3cd6e379025552873a8df6de322
 - name: github.com/issue9/identicon
   version: d36b54562f4cf70c83653e13dc95c220c79ef521
 - name: github.com/jaytaylor/html2text
@@ -137,6 +137,8 @@ imports:
   version: 4e86f4367175e39f69d9358a5f17b4dda270378d
 - name: gopkg.in/bufio.v1
   version: 567b2bfa514e796916c4747494d6ff5132a1dfce
+- name: gopkg.in/editorconfig/editorconfig-core-go.v1
+  version: a872f05c2e34b37b567401384d202aff11ba06d4
 - name: gopkg.in/gomail.v2
   version: 81ebce5c23dfd25c6c67194b37d3dd3f338c98b1
 - name: gopkg.in/ini.v1

glide.yaml

@@ -6,7 +6,7 @@ import:
 - package: github.com/Unknwon/com
 - package: github.com/Unknwon/i18n
 - package: github.com/Unknwon/paginater
-- package: github.com/codegangsta/cli
+- package: github.com/urfave/cli
 - package: github.com/go-macaron/binding
 - package: github.com/go-macaron/cache
   subpackages:
@@ -52,6 +52,7 @@ import:
   subpackages:
   - transform
   - language
+- package: gopkg.in/editorconfig/editorconfig-core-go.v1
 - package: gopkg.in/gomail.v2
 - package: gopkg.in/ini.v1
 - package: gopkg.in/ldap.v2

gogs.go

@@ -11,13 +11,13 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 
 	"github.com/gogits/gogs/cmd"
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.71.0809"
+const APP_VER = "0.9.97.0901"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
@@ -27,7 +27,7 @@ func init() {
 func main() {
 	app := cli.NewApp()
 	app.Name = "Gogs"
-	app.Usage = "Go Git Service"
+	app.Usage = "Go Git Service: a painless self-hosted Git service"
 	app.Version = APP_VER
 	app.Commands = []cli.Command{
 		cmd.CmdWeb,
@@ -35,6 +35,7 @@ func main() {
 		cmd.CmdUpdate,
 		cmd.CmdDump,
 		cmd.CmdCert,
+		cmd.CmdAdmin,
 	}
 	app.Flags = append(app.Flags, []cli.Flag{}...)
 	app.Run(os.Args)

models/action.go

@@ -6,7 +6,6 @@ package models
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"path"
 	"regexp"
@@ -45,10 +44,6 @@ const (
 	ACTION_REOPEN_PULL_REQUEST                       // 15
 )
 
-var (
-	ErrNotImplemented = errors.New("Not implemented yet")
-)
-
 var (
 	// Same as Github. See https://help.github.com/articles/closing-issues-via-commit-messages
 	IssueCloseKeywords  = []string{"close", "closes", "closed", "fix", "fixes", "fixed", "resolve", "resolves", "resolved"}
@@ -76,7 +71,6 @@ type Action struct {
 	OpType       ActionType
 	ActUserID    int64  // Action user id.
 	ActUserName  string // Action user name.
-	ActEmail     string
 	ActAvatar    string `xorm:"-"`
 	RepoID       int64
 	RepoUserName string
@@ -111,10 +105,6 @@ func (a *Action) ShortActUserName() string {
 	return base.EllipsisString(a.ActUserName, 20)
 }
 
-func (a *Action) GetActEmail() string {
-	return a.ActEmail
-}
-
 func (a *Action) GetRepoUserName() string {
 	return a.RepoUserName
 }
@@ -169,7 +159,7 @@ func (a *Action) GetIssueTitle() string {
 		log.Error(4, "GetIssueByIndex: %v", err)
 		return "500 when get issue"
 	}
-	return issue.Name
+	return issue.Title
 }
 
 func (a *Action) GetIssueContent() string {
@@ -186,7 +176,6 @@ func newRepoAction(e Engine, u *User, repo *Repository) (err error) {
 	if err = notifyWatchers(e, &Action{
 		ActUserID:    u.ID,
 		ActUserName:  u.Name,
-		ActEmail:     u.Email,
 		OpType:       ACTION_CREATE_REPO,
 		RepoID:       repo.ID,
 		RepoUserName: repo.Owner.Name,
@@ -209,7 +198,6 @@ func renameRepoAction(e Engine, actUser *User, oldRepoName string, repo *Reposit
 	if err = notifyWatchers(e, &Action{
 		ActUserID:    actUser.ID,
 		ActUserName:  actUser.Name,
-		ActEmail:     actUser.Email,
 		OpType:       ACTION_RENAME_REPO,
 		RepoID:       repo.ID,
 		RepoUserName: repo.Owner.Name,
@@ -246,7 +234,7 @@ type PushCommit struct {
 type PushCommits struct {
 	Len        int
 	Commits    []*PushCommit
-	CompareUrl string
+	CompareURL string
 
 	avatars map[string]string
 }
@@ -275,12 +263,12 @@ func (pc *PushCommits) ToApiPayloadCommits(repoLink string) []*api.PayloadCommit
 			ID:      commit.Sha1,
 			Message: commit.Message,
 			URL:     fmt.Sprintf("%s/commit/%s", repoLink, commit.Sha1),
-			Author: &api.PayloadAuthor{
+			Author: &api.PayloadUser{
 				Name:     commit.AuthorName,
 				Email:    commit.AuthorEmail,
 				UserName: authorUsername,
 			},
-			Committer: &api.PayloadCommitter{
+			Committer: &api.PayloadUser{
 				Name:     commit.CommitterName,
 				Email:    commit.CommitterEmail,
 				UserName: committerUsername,
@@ -310,8 +298,8 @@ func (push *PushCommits) AvatarLink(email string) string {
 	return push.avatars[email]
 }
 
-// updateIssuesCommit checks if issues are manipulated by commit message.
-func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string, commits []*PushCommit) error {
+// UpdateIssuesCommit checks if issues are manipulated by commit message.
+func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) error {
 	// Commits are appended in the reverse order.
 	for i := len(commits) - 1; i >= 0; i-- {
 		c := commits[i]
@@ -327,7 +315,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 
 			// Add repo name if missing
 			if ref[0] == '#' {
-				ref = fmt.Sprintf("%s/%s%s", repoUserName, repoName, ref)
+				ref = fmt.Sprintf("%s%s", repo.FullName(), ref)
 			} else if !strings.Contains(ref, "/") {
 				// FIXME: We don't support User#ID syntax yet
 				// return ErrNotImplemented
@@ -347,9 +335,8 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 			}
 			refMarked[issue.ID] = true
 
-			url := fmt.Sprintf("%s/%s/%s/commit/%s", setting.AppSubUrl, repoUserName, repoName, c.Sha1)
-			message := fmt.Sprintf(`<a href="%s">%s</a>`, url, c.Message)
-			if err = CreateRefComment(u, repo, issue, message, c.Sha1); err != nil {
+			message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, c.Message)
+			if err = CreateRefComment(doer, repo, issue, message, c.Sha1); err != nil {
 				return err
 			}
 		}
@@ -366,7 +353,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 
 			// Add repo name if missing
 			if ref[0] == '#' {
-				ref = fmt.Sprintf("%s/%s%s", repoUserName, repoName, ref)
+				ref = fmt.Sprintf("%s%s", repo.FullName(), ref)
 			} else if !strings.Contains(ref, "/") {
 				// We don't support User#ID syntax yet
 				// return ErrNotImplemented
@@ -390,7 +377,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 				continue
 			}
 
-			if err = issue.ChangeStatus(u, repo, true); err != nil {
+			if err = issue.ChangeStatus(doer, repo, true); err != nil {
 				return err
 			}
 		}
@@ -406,7 +393,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 
 			// Add repo name if missing
 			if ref[0] == '#' {
-				ref = fmt.Sprintf("%s/%s%s", repoUserName, repoName, ref)
+				ref = fmt.Sprintf("%s%s", repo.FullName(), ref)
 			} else if !strings.Contains(ref, "/") {
 				// We don't support User#ID syntax yet
 				// return ErrNotImplemented
@@ -430,7 +417,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 				continue
 			}
 
-			if err = issue.ChangeStatus(u, repo, false); err != nil {
+			if err = issue.ChangeStatus(doer, repo, false); err != nil {
 				return err
 			}
 		}
@@ -438,26 +425,26 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
 	return nil
 }
 
-// CommitRepoAction adds new action for committing repository.
-func CommitRepoAction(
-	userID, repoUserID int64,
-	userName, actEmail string,
-	repoID int64,
-	repoUserName, repoName string,
-	refFullName string,
-	commit *PushCommits,
-	oldCommitID string, newCommitID string) error {
+type CommitRepoActionOptions struct {
+	PusherName  string
+	RepoOwnerID int64
+	RepoName    string
+	RefFullName string
+	OldCommitID string
+	NewCommitID string
+	Commits     *PushCommits
+}
 
-	u, err := GetUserByID(userID)
+// CommitRepoAction adds new commit actio to the repository, and prepare corresponding webhooks.
+func CommitRepoAction(opts CommitRepoActionOptions) error {
+	pusher, err := GetUserByName(opts.PusherName)
 	if err != nil {
-		return fmt.Errorf("GetUserByID: %v", err)
+		return fmt.Errorf("GetUserByName [%s]: %v", opts.PusherName, err)
 	}
 
-	repo, err := GetRepositoryByName(repoUserID, repoName)
+	repo, err := GetRepositoryByName(opts.RepoOwnerID, opts.RepoName)
 	if err != nil {
-		return fmt.Errorf("GetRepositoryByName: %v", err)
-	} else if err = repo.GetOwner(); err != nil {
-		return fmt.Errorf("GetOwner: %v", err)
+		return fmt.Errorf("GetRepositoryByName [owner_id: %d, name: %s]: %v", opts.RepoOwnerID, opts.RepoName, err)
 	}
 
 	// Change repository bare status and update last updated time.
@@ -469,41 +456,39 @@ func CommitRepoAction(
 	isNewBranch := false
 	opType := ACTION_COMMIT_REPO
 	// Check it's tag push or branch.
-	if strings.HasPrefix(refFullName, "refs/tags/") {
+	if strings.HasPrefix(opts.RefFullName, git.TAG_PREFIX) {
 		opType = ACTION_PUSH_TAG
-		commit = &PushCommits{}
+		opts.Commits = &PushCommits{}
 	} else {
-		// if not the first commit, set the compareUrl
-		if !strings.HasPrefix(oldCommitID, "0000000") {
-			commit.CompareUrl = repo.ComposeCompareURL(oldCommitID, newCommitID)
-		} else {
+		// if not the first commit, set the compare URL.
+		if opts.OldCommitID == git.EMPTY_SHA {
 			isNewBranch = true
+		} else {
+			opts.Commits.CompareURL = repo.ComposeCompareURL(opts.OldCommitID, opts.NewCommitID)
 		}
 
-		if err = updateIssuesCommit(u, repo, repoUserName, repoName, commit.Commits); err != nil {
+		if err = UpdateIssuesCommit(pusher, repo, opts.Commits.Commits); err != nil {
 			log.Error(4, "updateIssuesCommit: %v", err)
 		}
 	}
 
-	if len(commit.Commits) > setting.UI.FeedMaxCommitNum {
-		commit.Commits = commit.Commits[:setting.UI.FeedMaxCommitNum]
+	if len(opts.Commits.Commits) > setting.UI.FeedMaxCommitNum {
+		opts.Commits.Commits = opts.Commits.Commits[:setting.UI.FeedMaxCommitNum]
 	}
 
-	bs, err := json.Marshal(commit)
+	data, err := json.Marshal(opts.Commits)
 	if err != nil {
 		return fmt.Errorf("Marshal: %v", err)
 	}
 
-	refName := git.RefEndName(refFullName)
-
+	refName := git.RefEndName(opts.RefFullName)
 	if err = NotifyWatchers(&Action{
-		ActUserID:    u.ID,
-		ActUserName:  userName,
-		ActEmail:     actEmail,
+		ActUserID:    pusher.ID,
+		ActUserName:  pusher.Name,
 		OpType:       opType,
-		Content:      string(bs),
+		Content:      string(data),
 		RepoID:       repo.ID,
-		RepoUserName: repoUserName,
+		RepoUserName: repo.MustOwner().Name,
 		RepoName:     repo.Name,
 		RefName:      refName,
 		IsPrivate:    repo.IsPrivate,
@@ -511,37 +496,24 @@ func CommitRepoAction(
 		return fmt.Errorf("NotifyWatchers: %v", err)
 	}
 
-	payloadRepo := repo.ComposePayload()
-
-	pusher_email, pusher_name := "", ""
-	pusher, err := GetUserByName(userName)
-	if err == nil {
-		pusher_email = pusher.Email
-		pusher_name = pusher.DisplayName()
-	}
-	payloadSender := &api.PayloadUser{
-		UserName:  pusher.Name,
-		ID:        pusher.ID,
-		AvatarUrl: pusher.AvatarLink(),
-	}
+	defer func() {
+		go HookQueue.Add(repo.ID)
+	}()
 
+	apiPusher := pusher.APIFormat()
+	apiRepo := repo.APIFormat(nil)
 	switch opType {
 	case ACTION_COMMIT_REPO: // Push
-		p := &api.PushPayload{
-			Ref:        refFullName,
-			Before:     oldCommitID,
-			After:      newCommitID,
-			CompareUrl: setting.AppUrl + commit.CompareUrl,
-			Commits:    commit.ToApiPayloadCommits(repo.FullLink()),
-			Repo:       payloadRepo,
-			Pusher: &api.PayloadAuthor{
-				Name:     pusher_name,
-				Email:    pusher_email,
-				UserName: userName,
-			},
-			Sender: payloadSender,
-		}
-		if err = PrepareWebhooks(repo, HOOK_EVENT_PUSH, p); err != nil {
+		if err = PrepareWebhooks(repo, HOOK_EVENT_PUSH, &api.PushPayload{
+			Ref:        opts.RefFullName,
+			Before:     opts.OldCommitID,
+			After:      opts.NewCommitID,
+			CompareURL: setting.AppUrl + opts.Commits.CompareURL,
+			Commits:    opts.Commits.ToApiPayloadCommits(repo.HTMLURL()),
+			Repo:       apiRepo,
+			Pusher:     apiPusher,
+			Sender:     apiPusher,
+		}); err != nil {
 			return fmt.Errorf("PrepareWebhooks: %v", err)
 		}
 
@@ -549,8 +521,8 @@ func CommitRepoAction(
 			return PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
 				Ref:     refName,
 				RefType: "branch",
-				Repo:    payloadRepo,
-				Sender:  payloadSender,
+				Repo:    apiRepo,
+				Sender:  apiPusher,
 			})
 		}
 
@@ -558,52 +530,50 @@ func CommitRepoAction(
 		return PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
 			Ref:     refName,
 			RefType: "tag",
-			Repo:    payloadRepo,
-			Sender:  payloadSender,
+			Repo:    apiRepo,
+			Sender:  apiPusher,
 		})
 	}
 
 	return nil
 }
 
-func transferRepoAction(e Engine, actUser, oldOwner, newOwner *User, repo *Repository) (err error) {
+func transferRepoAction(e Engine, doer, oldOwner *User, repo *Repository) (err error) {
 	if err = notifyWatchers(e, &Action{
-		ActUserID:    actUser.ID,
-		ActUserName:  actUser.Name,
-		ActEmail:     actUser.Email,
+		ActUserID:    doer.ID,
+		ActUserName:  doer.Name,
 		OpType:       ACTION_TRANSFER_REPO,
 		RepoID:       repo.ID,
-		RepoUserName: newOwner.Name,
+		RepoUserName: repo.Owner.Name,
 		RepoName:     repo.Name,
 		IsPrivate:    repo.IsPrivate,
 		Content:      path.Join(oldOwner.Name, repo.Name),
 	}); err != nil {
-		return fmt.Errorf("notify watchers '%d/%d': %v", actUser.ID, repo.ID, err)
+		return fmt.Errorf("notifyWatchers: %v", err)
 	}
 
 	// Remove watch for organization.
-	if repo.Owner.IsOrganization() {
-		if err = watchRepo(e, repo.Owner.ID, repo.ID, false); err != nil {
-			return fmt.Errorf("watch repository: %v", err)
+	if oldOwner.IsOrganization() {
+		if err = watchRepo(e, oldOwner.ID, repo.ID, false); err != nil {
+			return fmt.Errorf("watchRepo [false]: %v", err)
 		}
 	}
 
-	log.Trace("action.transferRepoAction: %s/%s", actUser.Name, repo.Name)
 	return nil
 }
 
-// TransferRepoAction adds new action for transferring repository.
-func TransferRepoAction(actUser, oldOwner, newOwner *User, repo *Repository) error {
-	return transferRepoAction(x, actUser, oldOwner, newOwner, repo)
+// TransferRepoAction adds new action for transferring repository,
+// the Owner field of repository is assumed to be new owner.
+func TransferRepoAction(doer, oldOwner *User, repo *Repository) error {
+	return transferRepoAction(x, doer, oldOwner, repo)
 }
 
-func mergePullRequestAction(e Engine, actUser *User, repo *Repository, pull *Issue) error {
+func mergePullRequestAction(e Engine, doer *User, repo *Repository, issue *Issue) error {
 	return notifyWatchers(e, &Action{
-		ActUserID:    actUser.ID,
-		ActUserName:  actUser.Name,
-		ActEmail:     actUser.Email,
+		ActUserID:    doer.ID,
+		ActUserName:  doer.Name,
 		OpType:       ACTION_MERGE_PULL_REQUEST,
-		Content:      fmt.Sprintf("%d|%s", pull.Index, pull.Name),
+		Content:      fmt.Sprintf("%d|%s", issue.Index, issue.Title),
 		RepoID:       repo.ID,
 		RepoUserName: repo.Owner.Name,
 		RepoName:     repo.Name,

models/error.go

@@ -417,6 +417,19 @@ func (err ErrInvalidTagName) Error() string {
 	return fmt.Sprintf("release tag name is not valid [tag_name: %s]", err.TagName)
 }
 
+type ErrRepoFileAlreadyExist struct {
+	FileName string
+}
+
+func IsErrRepoFileAlreadyExist(err error) bool {
+	_, ok := err.(ErrRepoFileAlreadyExist)
+	return ok
+}
+
+func (err ErrRepoFileAlreadyExist) Error() string {
+	return fmt.Sprintf("repository file already exists [file_name: %s]", err.FileName)
+}
+
 // __________                             .__
 // \______   \____________    ____   ____ |  |__
 //  |    |  _/\_  __ \__  \  /    \_/ ___\|  |  \
@@ -513,7 +526,8 @@ func (err ErrPullRequestNotExist) Error() string {
 //         \/             \/      \/     \/     \/
 
 type ErrCommentNotExist struct {
-	ID int64
+	ID      int64
+	IssueID int64
 }
 
 func IsErrCommentNotExist(err error) bool {
@@ -522,7 +536,7 @@ func IsErrCommentNotExist(err error) bool {
 }
 
 func (err ErrCommentNotExist) Error() string {
-	return fmt.Sprintf("comment does not exist [id: %d]", err.ID)
+	return fmt.Sprintf("comment does not exist [id: %d, issue_id: %d]", err.ID, err.IssueID)
 }
 
 // .____          ___.          .__
@@ -588,24 +602,50 @@ func (err ErrAttachmentNotExist) Error() string {
 	return fmt.Sprintf("attachment does not exist [id: %d, uuid: %s]", err.ID, err.UUID)
 }
 
-//    _____          __  .__                   __  .__               __  .__
-//   /  _  \  __ ___/  |_|  |__   ____   _____/  |_|__| ____ _____ _/  |_|__| ____   ____
-//  /  /_\  \|  |  \   __\  |  \_/ __ \ /    \   __\  |/ ___\\__  \\   __\  |/  _ \ /    \
-// /    |    \  |  /|  | |   Y  \  ___/|   |  \  | |  \  \___ / __ \|  | |  (  <_> )   |  \
-// \____|__  /____/ |__| |___|  /\___  >___|  /__| |__|\___  >____  /__| |__|\____/|___|  /
-//         \/                 \/     \/     \/             \/     \/                    \/
+// .____                 .__           _________
+// |    |    ____   ____ |__| ____    /   _____/ ____  __ _________   ____  ____
+// |    |   /  _ \ / ___\|  |/    \   \_____  \ /  _ \|  |  \_  __ \_/ ___\/ __ \
+// |    |__(  <_> ) /_/  >  |   |  \  /        (  <_> )  |  /|  | \/\  \__\  ___/
+// |_______ \____/\___  /|__|___|  / /_______  /\____/|____/ |__|    \___  >___  >
+//         \/    /_____/         \/          \/                          \/    \/
 
-type ErrAuthenticationNotExist struct {
+type ErrLoginSourceNotExist struct {
 	ID int64
 }
 
-func IsErrAuthenticationNotExist(err error) bool {
-	_, ok := err.(ErrAuthenticationNotExist)
+func IsErrLoginSourceNotExist(err error) bool {
+	_, ok := err.(ErrLoginSourceNotExist)
 	return ok
 }
 
-func (err ErrAuthenticationNotExist) Error() string {
-	return fmt.Sprintf("authentication does not exist [id: %d]", err.ID)
+func (err ErrLoginSourceNotExist) Error() string {
+	return fmt.Sprintf("login source does not exist [id: %d]", err.ID)
+}
+
+type ErrLoginSourceAlreadyExist struct {
+	Name string
+}
+
+func IsErrLoginSourceAlreadyExist(err error) bool {
+	_, ok := err.(ErrLoginSourceAlreadyExist)
+	return ok
+}
+
+func (err ErrLoginSourceAlreadyExist) Error() string {
+	return fmt.Sprintf("login source already exists [name: %s]", err.Name)
+}
+
+type ErrLoginSourceInUse struct {
+	ID int64
+}
+
+func IsErrLoginSourceInUse(err error) bool {
+	_, ok := err.(ErrLoginSourceInUse)
+	return ok
+}
+
+func (err ErrLoginSourceInUse) Error() string {
+	return fmt.Sprintf("login source is still used by some users [id: %d]", err.ID)
 }
 
 // ___________
@@ -628,3 +668,25 @@ func IsErrTeamAlreadyExist(err error) bool {
 func (err ErrTeamAlreadyExist) Error() string {
 	return fmt.Sprintf("team already exists [org_id: %d, name: %s]", err.OrgID, err.Name)
 }
+
+//  ____ ___        .__                    .___
+// |    |   \______ |  |   _________     __| _/
+// |    |   /\____ \|  |  /  _ \__  \   / __ |
+// |    |  / |  |_> >  |_(  <_> ) __ \_/ /_/ |
+// |______/  |   __/|____/\____(____  /\____ |
+//           |__|                   \/      \/
+//
+
+type ErrUploadNotExist struct {
+	ID   int64
+	UUID string
+}
+
+func IsErrUploadNotExist(err error) bool {
+	_, ok := err.(ErrAttachmentNotExist)
+	return ok
+}
+
+func (err ErrUploadNotExist) Error() string {
+	return fmt.Sprintf("attachment does not exist [id: %d, uuid: %s]", err.ID, err.UUID)
+}

models/git_diff.go

@@ -72,6 +72,15 @@ var (
 
 func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
 	buf := bytes.NewBuffer(nil)
+
+	// Reproduce signs which are cutted for inline diff before.
+	switch lineType {
+	case DIFF_LINE_ADD:
+		buf.WriteByte('+')
+	case DIFF_LINE_DEL:
+		buf.WriteByte('-')
+	}
+
 	for i := range diffs {
 		switch {
 		case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD:
@@ -155,19 +164,19 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
 	case DIFF_LINE_ADD:
 		compareDiffLine = diffSection.GetLine(DIFF_LINE_DEL, diffLine.RightIdx)
 		if compareDiffLine == nil {
-			return template.HTML(html.EscapeString(diffLine.Content[1:]))
+			return template.HTML(html.EscapeString(diffLine.Content))
 		}
 		diff1 = compareDiffLine.Content
 		diff2 = diffLine.Content
 	case DIFF_LINE_DEL:
 		compareDiffLine = diffSection.GetLine(DIFF_LINE_ADD, diffLine.LeftIdx)
 		if compareDiffLine == nil {
-			return template.HTML(html.EscapeString(diffLine.Content[1:]))
+			return template.HTML(html.EscapeString(diffLine.Content))
 		}
 		diff1 = diffLine.Content
 		diff2 = compareDiffLine.Content
 	default:
-		return template.HTML(html.EscapeString(diffLine.Content[1:]))
+		return template.HTML(html.EscapeString(diffLine.Content))
 	}
 
 	diffRecord := diffMatchPatch.DiffMain(diff1[1:], diff2[1:], true)
@@ -434,7 +443,7 @@ func GetDiffRange(repoPath, beforeCommitID, afterCommitID string, maxLines, maxL
 		return nil, fmt.Errorf("Start: %v", err)
 	}
 
-	pid := process.Add(fmt.Sprintf("GetDiffRange (%s)", repoPath), cmd)
+	pid := process.Add(fmt.Sprintf("GetDiffRange [repo_path: %s]", repoPath), cmd)
 	defer process.Remove(pid)
 
 	diff, err := ParsePatch(maxLines, maxLineCharacteres, maxFiles, stdout)

models/git_diff_test.go

@@ -19,14 +19,14 @@ func assertLineEqual(t *testing.T, d1 *DiffLine, d2 *DiffLine) {
 }
 
 func TestDiffToHTML(t *testing.T) {
-	assertEqual(t, "foo <span class=\"added-code\">bar</span> biz", diffToHTML([]dmp.Diff{
+	assertEqual(t, "+foo <span class=\"added-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 		dmp.Diff{dmp.DiffEqual, "foo "},
 		dmp.Diff{dmp.DiffInsert, "bar"},
 		dmp.Diff{dmp.DiffDelete, " baz"},
 		dmp.Diff{dmp.DiffEqual, " biz"},
 	}, DIFF_LINE_ADD))
 
-	assertEqual(t, "foo <span class=\"removed-code\">bar</span> biz", diffToHTML([]dmp.Diff{
+	assertEqual(t, "-foo <span class=\"removed-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 		dmp.Diff{dmp.DiffEqual, "foo "},
 		dmp.Diff{dmp.DiffDelete, "bar"},
 		dmp.Diff{dmp.DiffInsert, " baz"},

models/issue_comment.go

@@ -12,6 +12,8 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
 
+	api "github.com/gogits/go-gogs-client"
+
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/markdown"
 )
@@ -58,6 +60,8 @@ type Comment struct {
 
 	Created     time.Time `xorm:"-"`
 	CreatedUnix int64
+	Updated     time.Time `xorm:"-"`
+	UpdatedUnix int64
 
 	// Reference issue in commit message
 	CommitSHA string `xorm:"VARCHAR(40)"`
@@ -70,6 +74,11 @@ type Comment struct {
 
 func (c *Comment) BeforeInsert() {
 	c.CreatedUnix = time.Now().Unix()
+	c.UpdatedUnix = c.CreatedUnix
+}
+
+func (c *Comment) BeforeUpdate() {
+	c.UpdatedUnix = time.Now().Unix()
 }
 
 func (c *Comment) AfterSet(colName string, _ xorm.Cell) {
@@ -86,13 +95,15 @@ func (c *Comment) AfterSet(colName string, _ xorm.Cell) {
 		if err != nil {
 			if IsErrUserNotExist(err) {
 				c.PosterID = -1
-				c.Poster = NewFakeUser()
+				c.Poster = NewGhostUser()
 			} else {
 				log.Error(3, "GetUserByID[%d]: %v", c.ID, err)
 			}
 		}
 	case "created_unix":
 		c.Created = time.Unix(c.CreatedUnix, 0).Local()
+	case "updated_unix":
+		c.Updated = time.Unix(c.UpdatedUnix, 0).Local()
 	}
 }
 
@@ -104,6 +115,16 @@ func (c *Comment) AfterDelete() {
 	}
 }
 
+func (c *Comment) APIFormat() *api.Comment {
+	return &api.Comment{
+		ID:      c.ID,
+		Poster:  c.Poster.APIFormat(),
+		Body:    c.Content,
+		Created: c.Created,
+		Updated: c.Updated,
+	}
+}
+
 // HashTag returns unique hash tag for comment.
 func (c *Comment) HashTag() string {
 	return "issuecomment-" + com.ToStr(c.ID)
@@ -157,7 +178,6 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 	act := &Action{
 		ActUserID:    opts.Doer.ID,
 		ActUserName:  opts.Doer.Name,
-		ActEmail:     opts.Doer.Email,
 		Content:      fmt.Sprintf("%d|%s", opts.Issue.Index, strings.Split(opts.Content, "\n")[0]),
 		RepoID:       opts.Repo.ID,
 		RepoUserName: opts.Repo.Owner.Name,
@@ -329,15 +349,32 @@ func GetCommentByID(id int64) (*Comment, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrCommentNotExist{id}
+		return nil, ErrCommentNotExist{id, 0}
 	}
 	return c, nil
 }
 
-// GetCommentsByIssueID returns all comments of issue by given ID.
-func GetCommentsByIssueID(issueID int64) ([]*Comment, error) {
+func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, error) {
 	comments := make([]*Comment, 0, 10)
-	return comments, x.Where("issue_id=?", issueID).Asc("created_unix").Find(&comments)
+	sess := e.Where("issue_id = ?", issueID).Asc("created_unix")
+	if since > 0 {
+		sess.And("updated_unix >= ?", since)
+	}
+	return comments, sess.Find(&comments)
+}
+
+func getCommentsByIssueID(e Engine, issueID int64) ([]*Comment, error) {
+	return getCommentsByIssueIDSince(e, issueID, -1)
+}
+
+// GetCommentsByIssueID returns all comments of an issue.
+func GetCommentsByIssueID(issueID int64) ([]*Comment, error) {
+	return getCommentsByIssueID(x, issueID)
+}
+
+// GetCommentsByIssueID returns a list of comments of an issue since a given time point.
+func GetCommentsByIssueIDSince(issueID, since int64) ([]*Comment, error) {
+	return getCommentsByIssueIDSince(x, issueID, since)
 }
 
 // UpdateComment updates information of comment.
@@ -346,10 +383,13 @@ func UpdateComment(c *Comment) error {
 	return err
 }
 
-// DeleteCommentByID deletes a comment by given ID.
+// DeleteCommentByID deletes the comment by given ID.
 func DeleteCommentByID(id int64) error {
 	comment, err := GetCommentByID(id)
 	if err != nil {
+		if IsErrCommentNotExist(err) {
+			return nil
+		}
 		return err
 	}
 

models/issue_label.go

@@ -7,14 +7,51 @@ package models
 import (
 	"fmt"
 	"html/template"
+	"regexp"
 	"strconv"
 	"strings"
 
 	"github.com/go-xorm/xorm"
 
+	api "github.com/gogits/go-gogs-client"
+
 	"github.com/gogits/gogs/modules/base"
 )
 
+var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
+
+// GetLabelTemplateFile loads the label template file by given name,
+// then parses and returns a list of name-color pairs.
+func GetLabelTemplateFile(name string) ([][2]string, error) {
+	data, err := getRepoInitFile("label", name)
+	if err != nil {
+		return nil, fmt.Errorf("getRepoInitFile: %v", err)
+	}
+
+	lines := strings.Split(string(data), "\n")
+	list := make([][2]string, 0, len(lines))
+	for i := 0; i < len(lines); i++ {
+		line := strings.TrimSpace(lines[i])
+		if len(line) == 0 {
+			continue
+		}
+
+		fields := strings.SplitN(line, " ", 2)
+		if len(fields) != 2 {
+			return nil, fmt.Errorf("line is malformed: %s", line)
+		}
+
+		if !labelColorPattern.MatchString(fields[0]) {
+			return nil, fmt.Errorf("bad HTML color code in line: %s", line)
+		}
+
+		fields[1] = strings.TrimSpace(fields[1])
+		list = append(list, [2]string{fields[1], fields[0]})
+	}
+
+	return list, nil
+}
+
 // Label represents a label of repository for issues.
 type Label struct {
 	ID              int64 `xorm:"pk autoincr"`
@@ -27,9 +64,17 @@ type Label struct {
 	IsChecked       bool `xorm:"-"`
 }
 
+func (label *Label) APIFormat() *api.Label {
+	return &api.Label{
+		ID:    label.ID,
+		Name:  label.Name,
+		Color: label.Color,
+	}
+}
+
 // CalOpenIssues calculates the open issues of label.
-func (m *Label) CalOpenIssues() {
-	m.NumOpenIssues = m.NumIssues - m.NumClosedIssues
+func (label *Label) CalOpenIssues() {
+	label.NumOpenIssues = label.NumIssues - label.NumClosedIssues
 }
 
 // ForegroundColor calculates the text color for labels based
@@ -42,7 +87,7 @@ func (l *Label) ForegroundColor() template.CSS {
 			b := float32(0xFF & color)
 			luminance := (0.2126*r + 0.7152*g + 0.0722*b) / 255
 
-			if luminance < 0.5 {
+			if luminance < 0.66 {
 				return template.CSS("#fff")
 			}
 		}
@@ -52,9 +97,9 @@ func (l *Label) ForegroundColor() template.CSS {
 	return template.CSS("#000")
 }
 
-// NewLabel creates new label of repository.
-func NewLabel(l *Label) error {
-	_, err := x.Insert(l)
+// NewLabels creates new label(s) for a repository.
+func NewLabels(labels ...*Label) error {
+	_, err := x.Insert(labels)
 	return err
 }
 
@@ -93,13 +138,13 @@ func GetLabelInRepoByID(repoID, labelID int64) (*Label, error) {
 // it silently ignores label IDs that are not belong to the repository.
 func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
 	labels := make([]*Label, 0, len(labelIDs))
-	return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Find(&labels)
+	return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
 }
 
 // GetLabelsByRepoID returns all labels that belong to given repository by ID.
 func GetLabelsByRepoID(repoID int64) ([]*Label, error) {
 	labels := make([]*Label, 0, 10)
-	return labels, x.Where("repo_id = ?", repoID).Find(&labels)
+	return labels, x.Where("repo_id = ?", repoID).Asc("name").Find(&labels)
 }
 
 func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
@@ -116,7 +161,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
 	}
 
 	labels := make([]*Label, 0, len(labelIDs))
-	return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Find(&labels)
+	return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
 }
 
 // GetLabelsByIssueID returns all labels that belong to given issue by ID.

models/issue_mail.go

@@ -15,7 +15,7 @@ import (
 )
 
 func (issue *Issue) MailSubject() string {
-	return fmt.Sprintf("[%s] %s (#%d)", issue.Repo.Name, issue.Name, issue.Index)
+	return fmt.Sprintf("[%s] %s (#%d)", issue.Repo.Name, issue.Title, issue.Index)
 }
 
 // mailIssueCommentToParticipants can be used for both new issue creation and comment.

models/login_source.go

@@ -24,14 +24,9 @@ import (
 	"github.com/gogits/gogs/modules/log"
 )
 
-var (
-	ErrAuthenticationAlreadyExist = errors.New("Authentication already exist")
-	ErrAuthenticationUserUsed     = errors.New("Authentication has been used by some users")
-)
-
 type LoginType int
 
-// Note: new type must be added at the end of list to maintain compatibility.
+// Note: new type must append to the end of list to maintain compatibility.
 const (
 	LOGIN_NOTYPE LoginType = iota
 	LOGIN_PLAIN            // 1
@@ -106,6 +101,7 @@ func (cfg *PAMConfig) ToDB() ([]byte, error) {
 	return json.Marshal(cfg)
 }
 
+// LoginSource represents an external way for authorizing users.
 type LoginSource struct {
 	ID        int64 `xorm:"pk autoincr"`
 	Type      LoginType
@@ -223,15 +219,15 @@ func (source *LoginSource) SMTP() *SMTPConfig {
 func (source *LoginSource) PAM() *PAMConfig {
 	return source.Cfg.(*PAMConfig)
 }
+func CreateLoginSource(source *LoginSource) error {
+	has, err := x.Get(&LoginSource{Name: source.Name})
+	if err != nil {
+		return err
+	} else if has {
+		return ErrLoginSourceAlreadyExist{source.Name}
+	}
 
-// CountLoginSources returns number of login sources.
-func CountLoginSources() int64 {
-	count, _ := x.Count(new(LoginSource))
-	return count
-}
-
-func CreateSource(source *LoginSource) error {
-	_, err := x.Insert(source)
+	_, err = x.Insert(source)
 	return err
 }
 
@@ -247,7 +243,7 @@ func GetLoginSourceByID(id int64) (*LoginSource, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrAuthenticationNotExist{id}
+		return nil, ErrLoginSourceNotExist{id}
 	}
 	return source, nil
 }
@@ -262,12 +258,18 @@ func DeleteSource(source *LoginSource) error {
 	if err != nil {
 		return err
 	} else if count > 0 {
-		return ErrAuthenticationUserUsed
+		return ErrLoginSourceInUse{source.ID}
 	}
 	_, err = x.Id(source.ID).Delete(new(LoginSource))
 	return err
 }
 
+// CountLoginSources returns number of login sources.
+func CountLoginSources() int64 {
+	count, _ := x.Count(new(LoginSource))
+	return count
+}
+
 // .____     ________      _____ __________
 // |    |    \______ \    /  _  \\______   \
 // |    |     |    |  \  /  /_\  \|     ___/
@@ -275,49 +277,6 @@ func DeleteSource(source *LoginSource) error {
 // |_______ \/_______  /\____|__  /____|
 //         \/        \/         \/
 
-// LoginUserLDAPSource queries if loginName/passwd can login against the LDAP directory pool,
-// and create a local user if success when enabled.
-// It returns the same LoginUserPlain semantic.
-func LoginUserLDAPSource(u *User, loginName, passwd string, source *LoginSource, autoRegister bool) (*User, error) {
-	cfg := source.Cfg.(*LDAPConfig)
-	directBind := (source.Type == LOGIN_DLDAP)
-	username, fn, sn, mail, isAdmin, logged := cfg.SearchEntry(loginName, passwd, directBind)
-	if !logged {
-		// User not in LDAP, do nothing
-		return nil, ErrUserNotExist{0, loginName}
-	}
-
-	if !autoRegister {
-		return u, nil
-	}
-
-	// Fallback.
-	if len(username) == 0 {
-		username = loginName
-	}
-	// Validate username make sure it satisfies requirement.
-	if binding.AlphaDashDotPattern.MatchString(username) {
-		return nil, fmt.Errorf("Invalid pattern for attribute 'username' [%s]: must be valid alpha or numeric or dash(-_) or dot characters", username)
-	}
-
-	if len(mail) == 0 {
-		mail = fmt.Sprintf("%s@localhost", username)
-	}
-
-	u = &User{
-		LowerName:   strings.ToLower(username),
-		Name:        username,
-		FullName:    composeFullName(fn, sn, username),
-		LoginType:   source.Type,
-		LoginSource: source.ID,
-		LoginName:   loginName,
-		Email:       mail,
-		IsAdmin:     isAdmin,
-		IsActive:    true,
-	}
-	return u, CreateUser(u)
-}
-
 func composeFullName(firstname, surname, username string) string {
 	switch {
 	case len(firstname) == 0 && len(surname) == 0:
@@ -331,6 +290,46 @@ func composeFullName(firstname, surname, username string) string {
 	}
 }
 
+// LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
+// and create a local user if success when enabled.
+func LoginViaLDAP(user *User, login, passowrd string, source *LoginSource, autoRegister bool) (*User, error) {
+	username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, passowrd, source.Type == LOGIN_DLDAP)
+	if !succeed {
+		// User not in LDAP, do nothing
+		return nil, ErrUserNotExist{0, login}
+	}
+
+	if !autoRegister {
+		return user, nil
+	}
+
+	// Fallback.
+	if len(username) == 0 {
+		username = login
+	}
+	// Validate username make sure it satisfies requirement.
+	if binding.AlphaDashDotPattern.MatchString(username) {
+		return nil, fmt.Errorf("Invalid pattern for attribute 'username' [%s]: must be valid alpha or numeric or dash(-_) or dot characters", username)
+	}
+
+	if len(mail) == 0 {
+		mail = fmt.Sprintf("%s@localhost", username)
+	}
+
+	user = &User{
+		LowerName:   strings.ToLower(username),
+		Name:        username,
+		FullName:    composeFullName(fn, sn, username),
+		Email:       mail,
+		LoginType:   source.Type,
+		LoginSource: source.ID,
+		LoginName:   login,
+		IsActive:    true,
+		IsAdmin:     isAdmin,
+	}
+	return user, CreateUser(user)
+}
+
 //   _________   __________________________
 //  /   _____/  /     \__    ___/\______   \
 //  \_____  \  /  \ /  \|    |    |     ___/
@@ -338,25 +337,21 @@ func composeFullName(firstname, surname, username string) string {
 // /_______  /\____|__  /____|    |____|
 //         \/         \/
 
-type loginAuth struct {
+type smtpLoginAuth struct {
 	username, password string
 }
 
-func LoginAuth(username, password string) smtp.Auth {
-	return &loginAuth{username, password}
+func (auth *smtpLoginAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
+	return "LOGIN", []byte(auth.username), nil
 }
 
-func (a *loginAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
-	return "LOGIN", []byte(a.username), nil
-}
-
-func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
+func (auth *smtpLoginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
 	if more {
 		switch string(fromServer) {
 		case "Username:":
-			return []byte(a.username), nil
+			return []byte(auth.username), nil
 		case "Password:":
-			return []byte(a.password), nil
+			return []byte(auth.password), nil
 		}
 	}
 	return nil, nil
@@ -402,25 +397,24 @@ func SMTPAuth(a smtp.Auth, cfg *SMTPConfig) error {
 	return ErrUnsupportedLoginType
 }
 
-// Query if name/passwd can login against the LDAP directory pool
-// Create a local user if success
-// Return the same LoginUserPlain semantic
-func LoginUserSMTPSource(u *User, name, passwd string, sourceID int64, cfg *SMTPConfig, autoRegister bool) (*User, error) {
+// LoginViaSMTP queries if login/password is valid against the SMTP,
+// and create a local user if success when enabled.
+func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPConfig, autoRegister bool) (*User, error) {
 	// Verify allowed domains.
 	if len(cfg.AllowedDomains) > 0 {
-		idx := strings.Index(name, "@")
+		idx := strings.Index(login, "@")
 		if idx == -1 {
-			return nil, ErrUserNotExist{0, name}
-		} else if !com.IsSliceContainsStr(strings.Split(cfg.AllowedDomains, ","), name[idx+1:]) {
-			return nil, ErrUserNotExist{0, name}
+			return nil, ErrUserNotExist{0, login}
+		} else if !com.IsSliceContainsStr(strings.Split(cfg.AllowedDomains, ","), login[idx+1:]) {
+			return nil, ErrUserNotExist{0, login}
 		}
 	}
 
 	var auth smtp.Auth
 	if cfg.Auth == SMTP_PLAIN {
-		auth = smtp.PlainAuth("", name, passwd, cfg.Host)
+		auth = smtp.PlainAuth("", login, password, cfg.Host)
 	} else if cfg.Auth == SMTP_LOGIN {
-		auth = LoginAuth(name, passwd)
+		auth = &smtpLoginAuth{login, password}
 	} else {
 		return nil, errors.New("Unsupported SMTP auth type")
 	}
@@ -431,33 +425,32 @@ func LoginUserSMTPSource(u *User, name, passwd string, sourceID int64, cfg *SMTP
 		tperr, ok := err.(*textproto.Error)
 		if (ok && tperr.Code == 535) ||
 			strings.Contains(err.Error(), "Username and Password not accepted") {
-			return nil, ErrUserNotExist{0, name}
+			return nil, ErrUserNotExist{0, login}
 		}
 		return nil, err
 	}
 
 	if !autoRegister {
-		return u, nil
+		return user, nil
 	}
 
-	var loginName = name
-	idx := strings.Index(name, "@")
+	username := login
+	idx := strings.Index(login, "@")
 	if idx > -1 {
-		loginName = name[:idx]
+		username = login[:idx]
 	}
-	// fake a local user creation
-	u = &User{
-		LowerName:   strings.ToLower(loginName),
-		Name:        strings.ToLower(loginName),
+
+	user = &User{
+		LowerName:   strings.ToLower(username),
+		Name:        strings.ToLower(username),
+		Email:       login,
+		Passwd:      password,
 		LoginType:   LOGIN_SMTP,
 		LoginSource: sourceID,
-		LoginName:   name,
+		LoginName:   login,
 		IsActive:    true,
-		Passwd:      passwd,
-		Email:       name,
 	}
-	err := CreateUser(u)
-	return u, err
+	return user, CreateUser(user)
 }
 
 // __________  _____      _____
@@ -467,101 +460,99 @@ func LoginUserSMTPSource(u *User, name, passwd string, sourceID int64, cfg *SMTP
 //  |____|  \____|__  /\____|__  /
 //                  \/         \/
 
-// Query if name/passwd can login against PAM
-// Create a local user if success
-// Return the same LoginUserPlain semantic
-func LoginUserPAMSource(u *User, name, passwd string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) {
-	if err := pam.PAMAuth(cfg.ServiceName, name, passwd); err != nil {
+// LoginViaPAM queries if login/password is valid against the PAM,
+// and create a local user if success when enabled.
+func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) {
+	if err := pam.PAMAuth(cfg.ServiceName, login, password); err != nil {
 		if strings.Contains(err.Error(), "Authentication failure") {
-			return nil, ErrUserNotExist{0, name}
+			return nil, ErrUserNotExist{0, login}
 		}
 		return nil, err
 	}
 
 	if !autoRegister {
-		return u, nil
+		return user, nil
 	}
 
-	// fake a local user creation
-	u = &User{
-		LowerName:   strings.ToLower(name),
-		Name:        name,
+	user = &User{
+		LowerName:   strings.ToLower(login),
+		Name:        login,
+		Email:       login,
+		Passwd:      password,
 		LoginType:   LOGIN_PAM,
 		LoginSource: sourceID,
-		LoginName:   name,
+		LoginName:   login,
 		IsActive:    true,
-		Passwd:      passwd,
-		Email:       name,
 	}
-	return u, CreateUser(u)
+	return user, CreateUser(user)
 }
 
-func ExternalUserLogin(u *User, name, passwd string, source *LoginSource, autoRegister bool) (*User, error) {
+func ExternalUserLogin(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
 	if !source.IsActived {
 		return nil, ErrLoginSourceNotActived
 	}
 
 	switch source.Type {
 	case LOGIN_LDAP, LOGIN_DLDAP:
-		return LoginUserLDAPSource(u, name, passwd, source, autoRegister)
+		return LoginViaLDAP(user, login, password, source, autoRegister)
 	case LOGIN_SMTP:
-		return LoginUserSMTPSource(u, name, passwd, source.ID, source.Cfg.(*SMTPConfig), autoRegister)
+		return LoginViaSMTP(user, login, password, source.ID, source.Cfg.(*SMTPConfig), autoRegister)
 	case LOGIN_PAM:
-		return LoginUserPAMSource(u, name, passwd, source.ID, source.Cfg.(*PAMConfig), autoRegister)
+		return LoginViaPAM(user, login, password, source.ID, source.Cfg.(*PAMConfig), autoRegister)
 	}
 
 	return nil, ErrUnsupportedLoginType
 }
 
 // UserSignIn validates user name and password.
-func UserSignIn(uname, passwd string) (*User, error) {
-	var u *User
-	if strings.Contains(uname, "@") {
-		u = &User{Email: strings.ToLower(uname)}
+func UserSignIn(username, passowrd string) (*User, error) {
+	var user *User
+	if strings.Contains(username, "@") {
+		user = &User{Email: strings.ToLower(username)}
 	} else {
-		u = &User{LowerName: strings.ToLower(uname)}
+		user = &User{LowerName: strings.ToLower(username)}
 	}
 
-	userExists, err := x.Get(u)
+	hasUser, err := x.Get(user)
 	if err != nil {
 		return nil, err
 	}
 
-	if userExists {
-		switch u.LoginType {
+	if hasUser {
+		switch user.LoginType {
 		case LOGIN_NOTYPE, LOGIN_PLAIN:
-			if u.ValidatePassword(passwd) {
-				return u, nil
+			if user.ValidatePassword(passowrd) {
+				return user, nil
 			}
 
-			return nil, ErrUserNotExist{u.ID, u.Name}
+			return nil, ErrUserNotExist{user.ID, user.Name}
 
 		default:
 			var source LoginSource
-			hasSource, err := x.Id(u.LoginSource).Get(&source)
+			hasSource, err := x.Id(user.LoginSource).Get(&source)
 			if err != nil {
 				return nil, err
 			} else if !hasSource {
-				return nil, ErrLoginSourceNotExist
+				return nil, ErrLoginSourceNotExist{user.LoginSource}
 			}
 
-			return ExternalUserLogin(u, u.LoginName, passwd, &source, false)
+			return ExternalUserLogin(user, user.LoginName, passowrd, &source, false)
 		}
 	}
 
-	var sources []LoginSource
+	sources := make([]*LoginSource, 3)
 	if err = x.UseBool().Find(&sources, &LoginSource{IsActived: true}); err != nil {
 		return nil, err
 	}
 
 	for _, source := range sources {
-		u, err := ExternalUserLogin(nil, uname, passwd, &source, true)
+		authUser, err := ExternalUserLogin(nil, username, passowrd, source, true)
 		if err == nil {
-			return u, nil
+			return authUser, nil
 		}
 
-		log.Warn("Failed to login '%s' via '%s': %v", uname, source.Name, err)
+		log.Warn("Failed to login '%s' via '%s': %v", username, source.Name, err)
 	}
 
-	return nil, ErrUserNotExist{u.ID, u.Name}
+	return nil, ErrUserNotExist{user.ID, user.Name}
 }

models/mail.go

@@ -129,7 +129,7 @@ func SendCollaboratorMail(u, doer *User, repo *Repository) {
 	data := map[string]interface{}{
 		"Subject":  subject,
 		"RepoName": repoName,
-		"Link":     repo.FullLink(),
+		"Link":     repo.HTMLURL(),
 	}
 	body, err := mailRender.HTMLString(string(MAIL_NOTIFY_COLLABORATOR), data)
 	if err != nil {
@@ -153,14 +153,14 @@ func composeTplData(subject, body, link string) map[string]interface{} {
 
 func composeIssueMessage(issue *Issue, doer *User, tplName base.TplName, tos []string, info string) *mailer.Message {
 	subject := issue.MailSubject()
-	body := string(markdown.RenderSpecialLink([]byte(issue.Content), issue.Repo.FullLink(), issue.Repo.ComposeMetas()))
-	data := composeTplData(subject, body, issue.FullLink())
+	body := string(markdown.RenderSpecialLink([]byte(issue.Content), issue.Repo.HTMLURL(), issue.Repo.ComposeMetas()))
+	data := composeTplData(subject, body, issue.HTMLURL())
 	data["Doer"] = doer
 	content, err := mailRender.HTMLString(string(tplName), data)
 	if err != nil {
 		log.Error(3, "HTMLString (%s): %v", tplName, err)
 	}
-	msg := mailer.NewMessage(tos, subject, content)
+	msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.User), subject, content)
 	msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info)
 	return msg
 }

models/migrations/migrations.go

@@ -59,6 +59,7 @@ type Version struct {
 // If you want to "retire" a migration, remove it from the top of the list and
 // update _MIN_VER_DB accordingly
 var migrations = []Migration{
+	// v0 -> v4: before 0.6.0 -> 0.7.33
 	NewMigration("fix locale file load panic", fixLocaleFileLoadPanic),                           // V4 -> V5:v0.6.0
 	NewMigration("trim action compare URL prefix", trimCommitActionAppUrlPrefix),                 // V5 -> V6:v0.6.3
 	NewMigration("generate issue-label from issue", issueToIssueLabel),                           // V6 -> V7:v0.6.4
@@ -68,6 +69,9 @@ var migrations = []Migration{
 	NewMigration("generate rands and salt for organizations", generateOrgRandsAndSalt),           // V10 -> V11:v0.8.5
 	NewMigration("convert date to unix timestamp", convertDateToUnix),                            // V11 -> V12:v0.9.2
 	NewMigration("convert LDAP UseSSL option to SecurityProtocol", ldapUseSSLToSecurityProtocol), // V12 -> V13:v0.9.37
+
+	// v13 -> v14:v0.9.87
+	NewMigration("set comment updated with created", setCommentUpdatedWithCreated),
 }
 
 // Migrate database to current version
@@ -242,7 +246,7 @@ func issueToIssueLabel(x *xorm.Engine) error {
 	}
 
 	if err = sess.Sync2(new(IssueLabel)); err != nil {
-		return fmt.Errorf("sync2: %v", err)
+		return fmt.Errorf("Sync2: %v", err)
 	} else if _, err = sess.Insert(issueLabels); err != nil {
 		return fmt.Errorf("insert issue-labels: %v", err)
 	}

models/migrations/v14.go

@@ -0,0 +1,24 @@
+// Copyright 2016 The Gogs 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 migrations
+
+import (
+	"fmt"
+
+	"github.com/go-xorm/xorm"
+)
+
+func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) {
+	type Comment struct {
+		UpdatedUnix int64
+	}
+
+	if err = x.Sync2(new(Comment)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	} else if _, err = x.Exec("UPDATE comment SET updated_unix = created_unix"); err != nil {
+		return fmt.Errorf("set update_unix: %v", err)
+	}
+	return nil
+}

models/models.go

@@ -6,6 +6,7 @@ package models
 
 import (
 	"database/sql"
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
@@ -28,6 +29,7 @@ type Engine interface {
 	Find(interface{}, ...interface{}) error
 	Get(interface{}) (bool, error)
 	Id(interface{}) *xorm.Session
+	In(string, ...interface{}) *xorm.Session
 	Insert(...interface{}) (int64, error)
 	InsertOne(interface{}) (int64, error)
 	Iterate(interface{}, xorm.IterFunc) error
@@ -52,13 +54,13 @@ var (
 	}
 
 	EnableSQLite3 bool
-	EnableTidb    bool
+	EnableTiDB    bool
 )
 
 func init() {
 	tables = append(tables,
 		new(User), new(PublicKey), new(AccessToken),
-		new(Repository), new(DeployKey), new(Collaboration), new(Access),
+		new(Repository), new(DeployKey), new(Collaboration), new(Access), new(Upload),
 		new(Watch), new(Star), new(Follow), new(Action),
 		new(Issue), new(PullRequest), new(Comment), new(Attachment), new(IssueUser),
 		new(Label), new(IssueLabel), new(Milestone),
@@ -96,8 +98,23 @@ func LoadConfigs() {
 	DbCfg.Path = sec.Key("PATH").MustString("data/gogs.db")
 }
 
+// parsePostgreSQLHostPort parses given input in various forms defined in
+// https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
+// and returns proper host and port number.
+func parsePostgreSQLHostPort(info string) (string, string) {
+	host, port := "127.0.0.1", "5432"
+	if strings.Contains(info, ":") && !strings.HasSuffix(info, "]") {
+		idx := strings.LastIndex(info, ":")
+		host = info[:idx]
+		port = info[idx+1:]
+	} else if len(info) > 0 {
+		host = info
+	}
+	return host, port
+}
+
 func getEngine() (*xorm.Engine, error) {
-	cnnstr := ""
+	connStr := ""
 	var Param string = "?"
 	if strings.Contains(DbCfg.Name, Param) {
 		Param = "&"
@@ -105,43 +122,41 @@ func getEngine() (*xorm.Engine, error) {
 	switch DbCfg.Type {
 	case "mysql":
 		if DbCfg.Host[0] == '/' { // looks like a unix socket
-			cnnstr = fmt.Sprintf("%s:%s@unix(%s)/%s%scharset=utf8&parseTime=true",
+			connStr = fmt.Sprintf("%s:%s@unix(%s)/%s%scharset=utf8&parseTime=true",
 				DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name, Param)
 		} else {
-			cnnstr = fmt.Sprintf("%s:%s@tcp(%s)/%s%scharset=utf8&parseTime=true",
+			connStr = fmt.Sprintf("%s:%s@tcp(%s)/%s%scharset=utf8&parseTime=true",
 				DbCfg.User, DbCfg.Passwd, DbCfg.Host, DbCfg.Name, Param)
 		}
 	case "postgres":
-		var host, port = "127.0.0.1", "5432"
-		fields := strings.Split(DbCfg.Host, ":")
-		if len(fields) > 0 && len(strings.TrimSpace(fields[0])) > 0 {
-			host = fields[0]
+		host, port := parsePostgreSQLHostPort(DbCfg.Host)
+		if host[0] == '/' { // looks like a unix socket
+			connStr = fmt.Sprintf("postgres://%s:%s@:%s/%s%ssslmode=%s&host=%s",
+				url.QueryEscape(DbCfg.User), url.QueryEscape(DbCfg.Passwd), port, DbCfg.Name, Param, DbCfg.SSLMode, host)
+		} else {
+			connStr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s%ssslmode=%s",
+				url.QueryEscape(DbCfg.User), url.QueryEscape(DbCfg.Passwd), host, port, DbCfg.Name, Param, DbCfg.SSLMode)
 		}
-		if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 {
-			port = fields[1]
-		}
-		cnnstr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s%ssslmode=%s",
-			url.QueryEscape(DbCfg.User), url.QueryEscape(DbCfg.Passwd), host, port, DbCfg.Name, Param, DbCfg.SSLMode)
 	case "sqlite3":
 		if !EnableSQLite3 {
-			return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
+			return nil, errors.New("This binary version does not build support for SQLite3.")
 		}
 		if err := os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm); err != nil {
 			return nil, fmt.Errorf("Fail to create directories: %v", err)
 		}
-		cnnstr = "file:" + DbCfg.Path + "?cache=shared&mode=rwc"
+		connStr = "file:" + DbCfg.Path + "?cache=shared&mode=rwc"
 	case "tidb":
-		if !EnableTidb {
-			return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
+		if !EnableTiDB {
+			return nil, errors.New("This binary version does not build support for TiDB.")
 		}
 		if err := os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm); err != nil {
 			return nil, fmt.Errorf("Fail to create directories: %v", err)
 		}
-		cnnstr = "goleveldb://" + DbCfg.Path
+		connStr = "goleveldb://" + DbCfg.Path
 	default:
 		return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
 	}
-	return xorm.NewEngine(DbCfg.Type, cnnstr)
+	return xorm.NewEngine(DbCfg.Type, connStr)
 }
 
 func NewTestEngine(x *xorm.Engine) (err error) {

models/models_test.go

@@ -0,0 +1,33 @@
+// Copyright 2016 The Gogs 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 models
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func Test_parsePostgreSQLHostPort(t *testing.T) {
+	testSuites := []struct {
+		input      string
+		host, port string
+	}{
+		{"127.0.0.1:1234", "127.0.0.1", "1234"},
+		{"127.0.0.1", "127.0.0.1", "5432"},
+		{"[::1]:1234", "[::1]", "1234"},
+		{"[::1]", "[::1]", "5432"},
+		{"/tmp/pg.sock:1234", "/tmp/pg.sock", "1234"},
+		{"/tmp/pg.sock", "/tmp/pg.sock", "5432"},
+	}
+
+	Convey("Parse PostgreSQL host and port", t, func() {
+		for _, suite := range testSuites {
+			host, port := parsePostgreSQLHostPort(suite.input)
+			So(host, ShouldEqual, suite.host)
+			So(port, ShouldEqual, suite.port)
+		}
+	})
+}

models/models_tidb.go

@@ -13,6 +13,6 @@ import (
 )
 
 func init() {
-	EnableTidb = true
+	EnableTiDB = true
 	log.SetLevelByString("error")
 }

models/pull.go

@@ -20,8 +20,11 @@ import (
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/process"
 	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/modules/sync"
 )
 
+var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
+
 type PullRequestType int
 
 const (
@@ -68,7 +71,7 @@ func (pr *PullRequest) BeforeUpdate() {
 	pr.MergedUnix = pr.Merged.Unix()
 }
 
-// Note: don't try to get Pull because will end up recursive querying.
+// Note: don't try to get Issue because will end up recursive querying.
 func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
 	switch colName {
 	case "merged_unix":
@@ -80,6 +83,67 @@ func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
+// Note: don't try to get Issue because will end up recursive querying.
+func (pr *PullRequest) loadAttributes(e Engine) (err error) {
+	if pr.HasMerged && pr.Merger == nil {
+		pr.Merger, err = getUserByID(e, pr.MergerID)
+		if IsErrUserNotExist(err) {
+			pr.MergerID = -1
+			pr.Merger = NewGhostUser()
+		} else if err != nil {
+			return fmt.Errorf("getUserByID [%d]: %v", pr.MergerID, err)
+		}
+	}
+
+	return nil
+}
+
+func (pr *PullRequest) LoadAttributes() error {
+	return pr.loadAttributes(x)
+}
+
+func (pr *PullRequest) LoadIssue() (err error) {
+	if pr.Issue != nil {
+		return nil
+	}
+
+	pr.Issue, err = GetIssueByID(pr.IssueID)
+	return err
+}
+
+// This method assumes following fields have been assigned with valid values:
+// Required - Issue
+// Optional - Merger
+func (pr *PullRequest) APIFormat() *api.PullRequest {
+	apiIssue := pr.Issue.APIFormat()
+	apiPullRequest := &api.PullRequest{
+		ID:        pr.ID,
+		Index:     pr.Index,
+		Poster:    apiIssue.Poster,
+		Title:     apiIssue.Title,
+		Body:      apiIssue.Body,
+		Labels:    apiIssue.Labels,
+		Milestone: apiIssue.Milestone,
+		Assignee:  apiIssue.Assignee,
+		State:     apiIssue.State,
+		Comments:  apiIssue.Comments,
+		HTMLURL:   pr.Issue.HTMLURL(),
+		HasMerged: pr.HasMerged,
+	}
+
+	if pr.Status != PULL_REQUEST_STATUS_CHECKING {
+		mergeable := pr.Status != PULL_REQUEST_STATUS_CONFLICT
+		apiPullRequest.Mergeable = &mergeable
+	}
+	if pr.HasMerged {
+		apiPullRequest.Merged = &pr.Merged
+		apiPullRequest.MergedCommitID = &pr.MergedCommitID
+		apiPullRequest.MergedBy = pr.Merger.APIFormat()
+	}
+
+	return apiPullRequest
+}
+
 func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
 	pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
 	if err != nil && !IsErrRepoNotExist(err) {
@@ -88,7 +152,7 @@ func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
 	return nil
 }
 
-func (pr *PullRequest) GetHeadRepo() (err error) {
+func (pr *PullRequest) GetHeadRepo() error {
 	return pr.getHeadRepo(x)
 }
 
@@ -104,21 +168,6 @@ func (pr *PullRequest) GetBaseRepo() (err error) {
 	return nil
 }
 
-func (pr *PullRequest) GetMerger() (err error) {
-	if !pr.HasMerged || pr.Merger != nil {
-		return nil
-	}
-
-	pr.Merger, err = GetUserByID(pr.MergerID)
-	if IsErrUserNotExist(err) {
-		pr.MergerID = -1
-		pr.Merger = NewFakeUser()
-	} else if err != nil {
-		return fmt.Errorf("GetUserByID: %v", err)
-	}
-	return nil
-}
-
 // IsChecking returns true if this pull request is still checking conflict.
 func (pr *PullRequest) IsChecking() bool {
 	return pr.Status == PULL_REQUEST_STATUS_CHECKING
@@ -130,6 +179,7 @@ func (pr *PullRequest) CanAutoMerge() bool {
 }
 
 // Merge merges pull request to base repository.
+// FIXME: add repoWorkingPull make sure two merges does not happen at same time.
 func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error) {
 	if err = pr.GetHeadRepo(); err != nil {
 		return fmt.Errorf("GetHeadRepo: %v", err)
@@ -137,6 +187,11 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 		return fmt.Errorf("GetBaseRepo: %v", err)
 	}
 
+	defer func() {
+		go HookQueue.Add(pr.BaseRepo.ID)
+		go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false)
+	}()
+
 	sess := x.NewSession()
 	defer sessionRelease(sess)
 	if err = sess.Begin(); err != nil {
@@ -152,21 +207,6 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 	if err != nil {
 		return fmt.Errorf("OpenRepository: %v", err)
 	}
-	pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)
-	if err != nil {
-		return fmt.Errorf("GetBranchCommitID: %v", err)
-	}
-
-	if err = mergePullRequestAction(sess, doer, pr.Issue.Repo, pr.Issue); err != nil {
-		return fmt.Errorf("mergePullRequestAction: %v", err)
-	}
-
-	pr.HasMerged = true
-	pr.Merged = time.Now()
-	pr.MergerID = doer.ID
-	if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil {
-		return fmt.Errorf("update pull request: %v", err)
-	}
 
 	// Clone base repo.
 	tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git")
@@ -222,38 +262,72 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 		return fmt.Errorf("git push: %s", stderr)
 	}
 
+	pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.HeadBranch)
+	if err != nil {
+		return fmt.Errorf("GetBranchCommit: %v", err)
+	}
+
+	pr.HasMerged = true
+	pr.Merged = time.Now()
+	pr.MergerID = doer.ID
+	if _, err = sess.Id(pr.ID).AllCols().Update(pr); err != nil {
+		return fmt.Errorf("update pull request: %v", err)
+	}
+
 	if err = sess.Commit(); err != nil {
 		return fmt.Errorf("Commit: %v", err)
 	}
 
-	// Compose commit repository action
+	if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
+		log.Error(4, "MergePullRequestAction [%d]: %v", pr.ID, err)
+	}
+
+	// Reload pull request information.
+	if err = pr.LoadAttributes(); err != nil {
+		log.Error(4, "LoadAttributes: %v", err)
+		return nil
+	}
+	if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
+		Action:      api.HOOK_ISSUE_CLOSED,
+		Index:       pr.Index,
+		PullRequest: pr.APIFormat(),
+		Repository:  pr.Issue.Repo.APIFormat(nil),
+		Sender:      doer.APIFormat(),
+	}); err != nil {
+		log.Error(4, "PrepareWebhooks: %v", err)
+		return nil
+	}
+
 	l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
 	if err != nil {
-		return fmt.Errorf("CommitsBetween: %v", err)
+		log.Error(4, "CommitsBetweenIDs: %v", err)
+		return nil
 	}
+
+	// TODO: when squash commits, no need to append merge commit.
+	// It is possible that head branch is not fully sync with base branch for merge commits,
+	// so we need to get latest head commit and append merge commit manully
+	// to avoid strange diff commits produced.
+	mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
+	if err != nil {
+		log.Error(4, "GetBranchCommit: %v", err)
+		return nil
+	}
+	l.PushFront(mergeCommit)
+
 	p := &api.PushPayload{
-		Ref:        "refs/heads/" + pr.BaseBranch,
+		Ref:        git.BRANCH_PREFIX + pr.BaseBranch,
 		Before:     pr.MergeBase,
 		After:      pr.MergedCommitID,
-		CompareUrl: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
-		Commits:    ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.FullLink()),
-		Repo:       pr.BaseRepo.ComposePayload(),
-		Pusher: &api.PayloadAuthor{
-			Name:     pr.HeadRepo.MustOwner().DisplayName(),
-			Email:    pr.HeadRepo.MustOwner().Email,
-			UserName: pr.HeadRepo.MustOwner().Name,
-		},
-		Sender: &api.PayloadUser{
-			UserName:  doer.Name,
-			ID:        doer.ID,
-			AvatarUrl: doer.AvatarLink(),
-		},
+		CompareURL: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
+		Commits:    ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.HTMLURL()),
+		Repo:       pr.BaseRepo.APIFormat(nil),
+		Pusher:     pr.HeadRepo.MustOwner().APIFormat(),
+		Sender:     doer.APIFormat(),
 	}
 	if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
 		return fmt.Errorf("PrepareWebhooks: %v", err)
 	}
-	go HookQueue.Add(pr.BaseRepo.ID)
-	go AddTestPullRequestTask(pr.BaseRepo.ID, pr.BaseBranch)
 	return nil
 }
 
@@ -286,22 +360,17 @@ func (pr *PullRequest) testPatch() (err error) {
 		return nil
 	}
 
+	repoWorkingPool.CheckIn(com.ToStr(pr.BaseRepoID))
+	defer repoWorkingPool.CheckOut(com.ToStr(pr.BaseRepoID))
+
 	log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
 
-	if err := pr.BaseRepo.UpdateLocalCopy(); err != nil {
+	if err := pr.BaseRepo.UpdateLocalCopyBranch(pr.BaseBranch); err != nil {
 		return fmt.Errorf("UpdateLocalCopy: %v", err)
 	}
 
-	// Checkout base branch.
-	_, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
-		fmt.Sprintf("PullRequest.Merge (git checkout): %v", pr.BaseRepo.ID),
-		"git", "checkout", pr.BaseBranch)
-	if err != nil {
-		return fmt.Errorf("git checkout: %s", stderr)
-	}
-
 	pr.Status = PULL_REQUEST_STATUS_CHECKING
-	_, stderr, err = process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
+	_, stderr, err := process.ExecDir(-1, pr.BaseRepo.LocalCopyPath(),
 		fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
 		"git", "apply", "--check", patchPath)
 	if err != nil {
@@ -327,23 +396,16 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
 		return err
 	}
 
-	if err = newIssue(sess, repo, pull, labelIDs, uuids, true); err != nil {
+	if err = newIssue(sess, NewIssueOptions{
+		Repo:        repo,
+		Issue:       pull,
+		LableIDs:    labelIDs,
+		Attachments: uuids,
+		IsPull:      true,
+	}); err != nil {
 		return fmt.Errorf("newIssue: %v", err)
 	}
 
-	// Notify watchers.
-	act := &Action{
-		ActUserID:    pull.Poster.ID,
-		ActUserName:  pull.Poster.Name,
-		ActEmail:     pull.Poster.Email,
-		OpType:       ACTION_CREATE_PULL_REQUEST,
-		Content:      fmt.Sprintf("%d|%s", pull.Index, pull.Name),
-		RepoID:       repo.ID,
-		RepoUserName: repo.Owner.Name,
-		RepoName:     repo.Name,
-		IsPrivate:    repo.IsPrivate,
-	}
-
 	pr.Index = pull.Index
 	if err = repo.SavePatch(pr.Index, patch); err != nil {
 		return fmt.Errorf("SavePatch: %v", err)
@@ -353,6 +415,7 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
 	if err = pr.testPatch(); err != nil {
 		return fmt.Errorf("testPatch: %v", err)
 	}
+	// No conflict appears after test means mergeable.
 	if pr.Status == PULL_REQUEST_STATUS_CHECKING {
 		pr.Status = PULL_REQUEST_STATUS_MERGEABLE
 	}
@@ -366,12 +429,34 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
 		return fmt.Errorf("Commit: %v", err)
 	}
 
-	if err = NotifyWatchers(act); err != nil {
+	if err = NotifyWatchers(&Action{
+		ActUserID:    pull.Poster.ID,
+		ActUserName:  pull.Poster.Name,
+		OpType:       ACTION_CREATE_PULL_REQUEST,
+		Content:      fmt.Sprintf("%d|%s", pull.Index, pull.Title),
+		RepoID:       repo.ID,
+		RepoUserName: repo.Owner.Name,
+		RepoName:     repo.Name,
+		IsPrivate:    repo.IsPrivate,
+	}); err != nil {
 		log.Error(4, "NotifyWatchers: %v", err)
 	} else if err = pull.MailParticipants(); err != nil {
 		log.Error(4, "MailParticipants: %v", err)
 	}
 
+	pr.Issue = pull
+	pull.PullRequest = pr
+	if err = PrepareWebhooks(repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
+		Action:      api.HOOK_ISSUE_OPENED,
+		Index:       pull.Index,
+		PullRequest: pr.APIFormat(),
+		Repository:  repo.APIFormat(nil),
+		Sender:      pull.Poster.APIFormat(),
+	}); err != nil {
+		log.Error(4, "PrepareWebhooks: %v", err)
+	}
+	go HookQueue.Add(repo.ID)
+
 	return nil
 }
 
@@ -395,9 +480,9 @@ func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch
 // by given head information (repo and branch).
 func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
 	prs := make([]*PullRequest, 0, 2)
-	return prs, x.Where("head_repo_id=? AND head_branch=? AND has_merged=? AND issue.is_closed=?",
+	return prs, x.Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ?",
 		repoID, branch, false, false).
-		Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
+		Join("INNER", "issue", "issue.id = pull_request.issue_id").Find(&prs)
 }
 
 // GetUnmergedPullRequestsByBaseInfo returnss all pull requests that are open and has not been merged
@@ -409,30 +494,38 @@ func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequ
 		Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
 }
 
-// GetPullRequestByID returns a pull request by given ID.
-func GetPullRequestByID(id int64) (*PullRequest, error) {
+func getPullRequestByID(e Engine, id int64) (*PullRequest, error) {
 	pr := new(PullRequest)
-	has, err := x.Id(id).Get(pr)
+	has, err := e.Id(id).Get(pr)
 	if err != nil {
 		return nil, err
 	} else if !has {
 		return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
 	}
-	return pr, nil
+	return pr, pr.loadAttributes(e)
 }
 
-// GetPullRequestByIssueID returns pull request by given issue ID.
-func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
+// GetPullRequestByID returns a pull request by given ID.
+func GetPullRequestByID(id int64) (*PullRequest, error) {
+	return getPullRequestByID(x, id)
+}
+
+func getPullRequestByIssueID(e Engine, issueID int64) (*PullRequest, error) {
 	pr := &PullRequest{
 		IssueID: issueID,
 	}
-	has, err := x.Get(pr)
+	has, err := e.Get(pr)
 	if err != nil {
 		return nil, err
 	} else if !has {
 		return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
 	}
-	return pr, nil
+	return pr, pr.loadAttributes(e)
+}
+
+// GetPullRequestByIssueID returns pull request by given issue ID.
+func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
+	return getPullRequestByIssueID(x, issueID)
 }
 
 // Update updates all fields of pull request.
@@ -447,8 +540,6 @@ func (pr *PullRequest) UpdateCols(cols ...string) error {
 	return err
 }
 
-var PullRequestQueue = NewUniqueQueue(setting.Repository.PullRequestQueueLength)
-
 // UpdatePatch generates and saves a new patch.
 func (pr *PullRequest) UpdatePatch() (err error) {
 	if err = pr.GetHeadRepo(); err != nil {
@@ -536,6 +627,37 @@ func (pr *PullRequest) AddToTaskQueue() {
 	})
 }
 
+type PullRequestList []*PullRequest
+
+func (prs PullRequestList) loadAttributes(e Engine) error {
+	if len(prs) == 0 {
+		return nil
+	}
+
+	// Load issues.
+	issueIDs := make([]int64, 0, len(prs))
+	for i := range prs {
+		issueIDs = append(issueIDs, prs[i].IssueID)
+	}
+	issues := make([]*Issue, 0, len(issueIDs))
+	if err := e.Where("id > 0").In("id", issueIDs).Find(&issues); err != nil {
+		return fmt.Errorf("find issues: %v", err)
+	}
+
+	set := make(map[int64]*Issue)
+	for i := range issues {
+		set[issues[i].ID] = issues[i]
+	}
+	for i := range prs {
+		prs[i].Issue = set[prs[i].IssueID]
+	}
+	return nil
+}
+
+func (prs PullRequestList) LoadAttributes() error {
+	return prs.loadAttributes(x)
+}
+
 func addHeadRepoTasks(prs []*PullRequest) {
 	for _, pr := range prs {
 		log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
@@ -553,19 +675,47 @@ func addHeadRepoTasks(prs []*PullRequest) {
 
 // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
 // and generate new patch for testing as needed.
-func AddTestPullRequestTask(repoID int64, branch string) {
-	log.Trace("AddTestPullRequestTask[head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
+func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool) {
+	log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
 	prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
 	if err != nil {
-		log.Error(4, "Find pull requests[head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
+		log.Error(4, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
 		return
 	}
+
+	if isSync {
+		if err = PullRequestList(prs).LoadAttributes(); err != nil {
+			log.Error(4, "PullRequestList.LoadAttributes: %v", err)
+		}
+
+		if err == nil {
+			for _, pr := range prs {
+				pr.Issue.PullRequest = pr
+				if err = pr.Issue.LoadAttributes(); err != nil {
+					log.Error(4, "LoadAttributes: %v", err)
+					continue
+				}
+				if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
+					Action:      api.HOOK_ISSUE_SYNCHRONIZED,
+					Index:       pr.Issue.Index,
+					PullRequest: pr.Issue.PullRequest.APIFormat(),
+					Repository:  pr.Issue.Repo.APIFormat(nil),
+					Sender:      doer.APIFormat(),
+				}); err != nil {
+					log.Error(4, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
+					continue
+				}
+				go HookQueue.Add(pr.Issue.Repo.ID)
+			}
+		}
+	}
+
 	addHeadRepoTasks(prs)
 
-	log.Trace("AddTestPullRequestTask[base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
+	log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
 	prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
 	if err != nil {
-		log.Error(4, "Find pull requests[base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
+		log.Error(4, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
 		return
 	}
 	for _, pr := range prs {

models/repo.go

@@ -17,7 +17,6 @@ import (
 	"regexp"
 	"sort"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/Unknwon/cae/zip"
@@ -34,12 +33,15 @@ import (
 	"github.com/gogits/gogs/modules/markdown"
 	"github.com/gogits/gogs/modules/process"
 	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/modules/sync"
 )
 
 const (
 	_TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n"
 )
 
+var repoWorkingPool = sync.NewExclusivePool()
+
 var (
 	ErrRepoFileNotExist  = errors.New("Repository file does not exist")
 	ErrRepoFileNotLoaded = errors.New("Repository file not loaded")
@@ -49,7 +51,7 @@ var (
 )
 
 var (
-	Gitignores, Licenses, Readmes []string
+	Gitignores, Licenses, Readmes, LabelTemplates []string
 
 	// Maximum items per page in forks, watchers and stars of a repo
 	ItemsPerPage = 40
@@ -57,8 +59,8 @@ var (
 
 func LoadRepoConfig() {
 	// Load .gitignore and license files and readme templates.
-	types := []string{"gitignore", "license", "readme"}
-	typeFiles := make([][]string, 3)
+	types := []string{"gitignore", "license", "readme", "label"}
+	typeFiles := make([][]string, 4)
 	for i, t := range types {
 		files, err := bindata.AssetDir("conf/" + t)
 		if err != nil {
@@ -83,9 +85,25 @@ func LoadRepoConfig() {
 	Gitignores = typeFiles[0]
 	Licenses = typeFiles[1]
 	Readmes = typeFiles[2]
+	LabelTemplates = typeFiles[3]
 	sort.Strings(Gitignores)
 	sort.Strings(Licenses)
 	sort.Strings(Readmes)
+	sort.Strings(LabelTemplates)
+
+	// Filter out invalid names and promote preferred licenses.
+	sortedLicenses := make([]string, 0, len(Licenses))
+	for _, name := range setting.Repository.PreferredLicenses {
+		if com.IsSliceContainsStr(Licenses, name) {
+			sortedLicenses = append(sortedLicenses, name)
+		}
+	}
+	for _, name := range Licenses {
+		if !com.IsSliceContainsStr(setting.Repository.PreferredLicenses, name) {
+			sortedLicenses = append(sortedLicenses, name)
+		}
+	}
+	Licenses = sortedLicenses
 }
 
 func NewRepoContext() {
@@ -216,6 +234,48 @@ func (repo *Repository) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
+// MustOwner always returns a valid *User object to avoid
+// conceptually impossible error handling.
+// It creates a fake object that contains error deftail
+// when error occurs.
+func (repo *Repository) MustOwner() *User {
+	return repo.mustOwner(x)
+}
+
+func (repo *Repository) FullName() string {
+	return repo.MustOwner().Name + "/" + repo.Name
+}
+
+func (repo *Repository) HTMLURL() string {
+	return setting.AppUrl + repo.FullName()
+}
+
+// Arguments that are allowed to be nil: permission
+func (repo *Repository) APIFormat(permission *api.Permission) *api.Repository {
+	cloneLink := repo.CloneLink()
+	return &api.Repository{
+		ID:            repo.ID,
+		Owner:         repo.Owner.APIFormat(),
+		Name:          repo.Name,
+		FullName:      repo.FullName(),
+		Description:   repo.Description,
+		Private:       repo.IsPrivate,
+		Fork:          repo.IsFork,
+		HTMLURL:       repo.HTMLURL(),
+		SSHURL:        cloneLink.SSH,
+		CloneURL:      cloneLink.HTTPS,
+		Website:       repo.Website,
+		Stars:         repo.NumStars,
+		Forks:         repo.NumForks,
+		Watchers:      repo.NumWatches,
+		OpenIssues:    repo.NumOpenIssues,
+		DefaultBranch: repo.DefaultBranch,
+		Created:       repo.Created,
+		Updated:       repo.Updated,
+		Permissions:   permission,
+	}
+}
+
 func (repo *Repository) getOwner(e Engine) (err error) {
 	if repo.Owner != nil {
 		return nil
@@ -240,14 +300,6 @@ func (repo *Repository) mustOwner(e Engine) *User {
 	return repo.Owner
 }
 
-// MustOwner always returns a valid *User object to avoid
-// conceptually impossible error handling.
-// It creates a fake object that contains error deftail
-// when error occurs.
-func (repo *Repository) MustOwner() *User {
-	return repo.mustOwner(x)
-}
-
 // ComposeMetas composes a map of metas for rendering external issue tracker URL.
 func (repo *Repository) ComposeMetas() map[string]string {
 	if !repo.EnableExternalTracker {
@@ -277,33 +329,42 @@ func (repo *Repository) DeleteWiki() {
 	}
 }
 
-// GetAssignees returns all users that have write access of repository.
-func (repo *Repository) GetAssignees() (_ []*User, err error) {
-	if err = repo.GetOwner(); err != nil {
+func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) {
+	if err = repo.getOwner(e); err != nil {
 		return nil, err
 	}
 
 	accesses := make([]*Access, 0, 10)
-	if err = x.Where("repo_id=? AND mode>=?", repo.ID, ACCESS_MODE_WRITE).Find(&accesses); err != nil {
+	if err = e.Where("repo_id = ? AND mode >= ?", repo.ID, ACCESS_MODE_WRITE).Find(&accesses); err != nil {
 		return nil, err
 	}
 
-	users := make([]*User, 0, len(accesses)+1) // Just waste 1 unit does not matter.
+	// Leave a seat for owner itself to append later, but if owner is an organization
+	// and just waste 1 unit is cheaper than re-allocate memory once.
+	users := make([]*User, 0, len(accesses)+1)
+	if len(accesses) > 0 {
+		userIDs := make([]int64, len(accesses))
+		for i := 0; i < len(accesses); i++ {
+			userIDs[i] = accesses[i].UserID
+		}
+
+		if err = e.In("id", userIDs).Find(&users); err != nil {
+			return nil, err
+		}
+	}
 	if !repo.Owner.IsOrganization() {
 		users = append(users, repo.Owner)
 	}
 
-	var u *User
-	for i := range accesses {
-		u, err = GetUserByID(accesses[i].UserID)
-		if err != nil {
-			return nil, err
-		}
-		users = append(users, u)
-	}
 	return users, nil
 }
 
+// GetAssignees returns all users that have write access and can be assigned to issues
+// of the repository,
+func (repo *Repository) GetAssignees() (_ []*User, err error) {
+	return repo.getAssignees(x)
+}
+
 // GetAssigneeByID returns the user that has write access of repository by given ID.
 func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) {
 	return GetAssigneeByID(repo, userID)
@@ -311,7 +372,7 @@ func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) {
 
 // GetMilestoneByID returns the milestone belongs to repository by given ID.
 func (repo *Repository) GetMilestoneByID(milestoneID int64) (*Milestone, error) {
-	return GetRepoMilestoneByID(repo.ID, milestoneID)
+	return GetMilestoneByRepoID(repo.ID, milestoneID)
 }
 
 // IssueStats returns number of open and closed repository issues by given filter mode.
@@ -320,7 +381,7 @@ func (repo *Repository) IssueStats(uid int64, filterMode int, isPull bool) (int6
 }
 
 func (repo *Repository) GetMirror() (err error) {
-	repo.Mirror, err = GetMirror(repo.ID)
+	repo.Mirror, err = GetMirrorByRepoID(repo.ID)
 	return err
 }
 
@@ -345,22 +406,18 @@ func (repo *Repository) GitConfigPath() string {
 	return filepath.Join(repo.RepoPath(), "config")
 }
 
-func (repo *Repository) Link() string {
-	return setting.AppSubUrl + "/" + repo.MustOwner().Name + "/" + repo.Name
+func (repo *Repository) RelLink() string {
+	return "/" + repo.FullName()
 }
 
-func (repo *Repository) RelLink() string {
-	return "/" + repo.MustOwner().Name + "/" + repo.Name
+func (repo *Repository) Link() string {
+	return setting.AppSubUrl + "/" + repo.FullName()
 }
 
 func (repo *Repository) ComposeCompareURL(oldCommitID, newCommitID string) string {
 	return fmt.Sprintf("%s/%s/compare/%s...%s", repo.MustOwner().Name, repo.Name, oldCommitID, newCommitID)
 }
 
-func (repo *Repository) FullLink() string {
-	return setting.AppUrl + repo.MustOwner().Name + "/" + repo.Name
-}
-
 func (repo *Repository) HasAccess(u *User) bool {
 	has, _ := HasAccess(u, repo, ACCESS_MODE_READ)
 	return has
@@ -385,6 +442,13 @@ func (repo *Repository) AllowsPulls() bool {
 	return repo.CanEnablePulls() && repo.EnablePulls
 }
 
+// CanEnableEditor returns true if repository meets the requirements of web editor.
+func (repo *Repository) CanEnableEditor() bool {
+	return !repo.IsMirror
+}
+
+// FIXME: should have a mutex to prevent producing same index for two issues that are created
+// closely enough.
 func (repo *Repository) NextIssueIndex() int64 {
 	return int64(repo.NumIssues+repo.NumPulls) + 1
 }
@@ -402,30 +466,41 @@ func (repo *Repository) DescriptionHtml() template.HTML {
 }
 
 func (repo *Repository) LocalCopyPath() string {
-	return path.Join(setting.AppDataPath, "tmp/local", com.ToStr(repo.ID))
+	return path.Join(setting.AppDataPath, "tmp/local-rpeo", com.ToStr(repo.ID))
 }
 
-func updateLocalCopy(repoPath, localPath string) error {
+// UpdateLocalCopy pulls latest changes of given branch from repoPath to localPath.
+// It creates a new clone if local copy does not exist.
+// This function checks out target branch by default, it is safe to assume subsequent
+// operations are operating against target branch when caller has confidence for no race condition.
+func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {
 	if !com.IsExist(localPath) {
 		if err := git.Clone(repoPath, localPath, git.CloneRepoOptions{
 			Timeout: time.Duration(setting.Git.Timeout.Clone) * time.Second,
+			Branch:  branch,
 		}); err != nil {
-			return fmt.Errorf("Clone: %v", err)
+			return fmt.Errorf("git clone %s: %v", branch, err)
 		}
 	} else {
-		if err := git.Pull(localPath, git.PullRemoteOptions{
-			All:     true,
-			Timeout: time.Duration(setting.Git.Timeout.Pull) * time.Second,
+		if err := git.Checkout(localPath, git.CheckoutOptions{
+			Branch: branch,
 		}); err != nil {
-			return fmt.Errorf("Pull: %v", err)
+			return fmt.Errorf("git checkout %s: %v", branch, err)
+		}
+		if err := git.Pull(localPath, git.PullRemoteOptions{
+			Timeout: time.Duration(setting.Git.Timeout.Pull) * time.Second,
+			Remote:  "origin",
+			Branch:  branch,
+		}); err != nil {
+			return fmt.Errorf("git pull origin %s: %v", branch, err)
 		}
 	}
 	return nil
 }
 
-// UpdateLocalCopy makes sure the local copy of repository is up-to-date.
-func (repo *Repository) UpdateLocalCopy() error {
-	return updateLocalCopy(repo.RepoPath(), repo.LocalCopyPath())
+// UpdateLocalCopyBranch makes sure local copy of repository in given branch is up-to-date.
+func (repo *Repository) UpdateLocalCopyBranch(branch string) error {
+	return UpdateLocalCopyBranch(repo.RepoPath(), repo.LocalCopyPath(), branch)
 }
 
 // PatchPath returns corresponding patch file path of repository by given issue ID.
@@ -452,28 +527,6 @@ func (repo *Repository) SavePatch(index int64, patch []byte) error {
 	return nil
 }
 
-// ComposePayload composes and returns *api.PayloadRepo corresponding to the repository.
-func (repo *Repository) ComposePayload() *api.PayloadRepo {
-	cl := repo.CloneLink()
-	return &api.PayloadRepo{
-		ID:          repo.ID,
-		Name:        repo.Name,
-		URL:         repo.FullLink(),
-		SSHURL:      cl.SSH,
-		CloneURL:    cl.HTTPS,
-		Description: repo.Description,
-		Website:     repo.Website,
-		Watchers:    repo.NumWatches,
-		Owner: &api.PayloadAuthor{
-			Name:     repo.MustOwner().DisplayName(),
-			Email:    repo.MustOwner().Email,
-			UserName: repo.MustOwner().Name,
-		},
-		Private:       repo.IsPrivate,
-		DefaultBranch: repo.DefaultBranch,
-	}
-}
-
 func isRepositoryExist(e Engine, u *User, repoName string) (bool, error) {
 	has, err := e.Get(&Repository{
 		OwnerID:   u.ID,
@@ -512,7 +565,7 @@ func (repo *Repository) cloneLink(isWiki bool) *CloneLink {
 	} else {
 		cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", setting.RunUser, setting.SSH.Domain, repo.Owner.Name, repoName)
 	}
-	cl.HTTPS = ComposeHTTPSCloneURL(repo.Owner.Name, repo.Name)
+	cl.HTTPS = ComposeHTTPSCloneURL(repo.Owner.Name, repoName)
 	return cl
 }
 
@@ -521,136 +574,6 @@ func (repo *Repository) CloneLink() (cl *CloneLink) {
 	return repo.cloneLink(false)
 }
 
-// Mirror represents a mirror information of repository.
-type Mirror struct {
-	ID          int64 `xorm:"pk autoincr"`
-	RepoID      int64
-	Repo        *Repository `xorm:"-"`
-	Interval    int         // Hour.
-	EnablePrune bool        `xorm:"NOT NULL DEFAULT true"`
-
-	Updated        time.Time `xorm:"-"`
-	UpdatedUnix    int64
-	NextUpdate     time.Time `xorm:"-"`
-	NextUpdateUnix int64
-
-	address string `xorm:"-"`
-}
-
-func (m *Mirror) BeforeInsert() {
-	m.NextUpdateUnix = m.NextUpdate.Unix()
-}
-
-func (m *Mirror) BeforeUpdate() {
-	m.UpdatedUnix = time.Now().Unix()
-	m.NextUpdateUnix = m.NextUpdate.Unix()
-}
-
-func (m *Mirror) AfterSet(colName string, _ xorm.Cell) {
-	var err error
-	switch colName {
-	case "repo_id":
-		m.Repo, err = GetRepositoryByID(m.RepoID)
-		if err != nil {
-			log.Error(3, "GetRepositoryByID[%d]: %v", m.ID, err)
-		}
-	case "updated_unix":
-		m.Updated = time.Unix(m.UpdatedUnix, 0).Local()
-	case "next_updated_unix":
-		m.NextUpdate = time.Unix(m.NextUpdateUnix, 0).Local()
-	}
-}
-
-func (m *Mirror) readAddress() {
-	if len(m.address) > 0 {
-		return
-	}
-
-	cfg, err := ini.Load(m.Repo.GitConfigPath())
-	if err != nil {
-		log.Error(4, "Load: %v", err)
-		return
-	}
-	m.address = cfg.Section("remote \"origin\"").Key("url").Value()
-}
-
-// HandleCloneUserCredentials replaces user credentials from HTTP/HTTPS URL
-// with placeholder <credentials>.
-// It will fail for any other forms of clone addresses.
-func HandleCloneUserCredentials(url string, mosaics bool) string {
-	i := strings.Index(url, "@")
-	if i == -1 {
-		return url
-	}
-	start := strings.Index(url, "://")
-	if start == -1 {
-		return url
-	}
-	if mosaics {
-		return url[:start+3] + "<credentials>" + url[i:]
-	}
-	return url[:start+3] + url[i+1:]
-}
-
-// Address returns mirror address from Git repository config without credentials.
-func (m *Mirror) Address() string {
-	m.readAddress()
-	return HandleCloneUserCredentials(m.address, false)
-}
-
-// FullAddress returns mirror address from Git repository config.
-func (m *Mirror) FullAddress() string {
-	m.readAddress()
-	return m.address
-}
-
-// SaveAddress writes new address to Git repository config.
-func (m *Mirror) SaveAddress(addr string) error {
-	configPath := m.Repo.GitConfigPath()
-	cfg, err := ini.Load(configPath)
-	if err != nil {
-		return fmt.Errorf("Load: %v", err)
-	}
-
-	cfg.Section("remote \"origin\"").Key("url").SetValue(addr)
-	return cfg.SaveToIndent(configPath, "\t")
-}
-
-func getMirror(e Engine, repoId int64) (*Mirror, error) {
-	m := &Mirror{RepoID: repoId}
-	has, err := e.Get(m)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, ErrMirrorNotExist
-	}
-	return m, nil
-}
-
-// GetMirror returns mirror object by given repository ID.
-func GetMirror(repoId int64) (*Mirror, error) {
-	return getMirror(x, repoId)
-}
-
-func updateMirror(e Engine, m *Mirror) error {
-	_, err := e.Id(m.ID).AllCols().Update(m)
-	return err
-}
-
-func UpdateMirror(m *Mirror) error {
-	return updateMirror(x, m)
-}
-
-func DeleteMirrorByRepoID(repoID int64) error {
-	_, err := x.Delete(&Mirror{RepoID: repoID})
-	return err
-}
-
-func createUpdateHook(repoPath string) error {
-	return git.SetUpdateHook(repoPath,
-		fmt.Sprintf(_TPL_UPDATE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf))
-}
-
 type MigrateRepoOptions struct {
 	Name        string
 	Description string
@@ -659,6 +582,25 @@ type MigrateRepoOptions struct {
 	RemoteAddr  string
 }
 
+/*
+	GitHub, GitLab, Gogs: *.wiki.git
+	BitBucket: *.git/wiki
+*/
+var commonWikiURLSuffixes = []string{".wiki.git", ".git/wiki"}
+
+// wikiRemoteURL returns accessible repository URL for wiki if exists.
+// Otherwise, it returns an empty string.
+func wikiRemoteURL(remote string) string {
+	remote = strings.TrimSuffix(remote, ".git")
+	for _, suffix := range commonWikiURLSuffixes {
+		wikiURL := remote + suffix
+		if git.IsRepoURLAccessible(wikiURL) {
+			return wikiURL
+		}
+	}
+	return ""
+}
+
 // MigrateRepository migrates a existing repository from other project hosting.
 func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 	repo, err := CreateRepository(u, CreateRepoOptions{
@@ -676,6 +618,7 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 	os.MkdirAll(tmpDir, os.ModePerm)
 
 	repoPath := RepoPath(u.Name, opts.Name)
+	wikiPath := WikiPath(u.Name, opts.Name)
 
 	if u.IsOrganization() {
 		t, err := u.GetOwnerTeam()
@@ -687,15 +630,29 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 		repo.NumWatches = 1
 	}
 
+	migrateTimeout := time.Duration(setting.Git.Timeout.Migrate) * time.Second
+
 	os.RemoveAll(repoPath)
 	if err = git.Clone(opts.RemoteAddr, repoPath, git.CloneRepoOptions{
 		Mirror:  true,
 		Quiet:   true,
-		Timeout: time.Duration(setting.Git.Timeout.Migrate) * time.Second,
+		Timeout: migrateTimeout,
 	}); err != nil {
 		return repo, fmt.Errorf("Clone: %v", err)
 	}
 
+	wikiRemotePath := wikiRemoteURL(opts.RemoteAddr)
+	if len(wikiRemotePath) > 0 {
+		os.RemoveAll(wikiPath)
+		if err = git.Clone(wikiRemotePath, wikiPath, git.CloneRepoOptions{
+			Mirror:  true,
+			Quiet:   true,
+			Timeout: migrateTimeout,
+		}); err != nil {
+			log.Info("Clone wiki: %v", err)
+		}
+	}
+
 	// Check if repository is empty.
 	_, stderr, err := com.ExecCmdDir(repoPath, "git", "log", "-1")
 	if err != nil {
@@ -735,25 +692,47 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 		return repo, UpdateRepository(repo, false)
 	}
 
-	return CleanUpMigrateInfo(repo, repoPath)
+	return CleanUpMigrateInfo(repo)
 }
 
-// Finish migrating repository with things that don't need to be done for mirrors.
-func CleanUpMigrateInfo(repo *Repository, repoPath string) (*Repository, error) {
-	if err := createUpdateHook(repoPath); err != nil {
-		return repo, fmt.Errorf("createUpdateHook: %v", err)
-	}
-
-	// Clean up mirror info which prevents "push --all".
-	// This also removes possible user credentials.
-	configPath := repo.GitConfigPath()
+// cleanUpMigrateGitConfig removes mirror info which prevents "push --all".
+// This also removes possible user credentials.
+func cleanUpMigrateGitConfig(configPath string) error {
 	cfg, err := ini.Load(configPath)
 	if err != nil {
-		return repo, fmt.Errorf("open config file: %v", err)
+		return fmt.Errorf("open config file: %v", err)
 	}
 	cfg.DeleteSection("remote \"origin\"")
 	if err = cfg.SaveToIndent(configPath, "\t"); err != nil {
-		return repo, fmt.Errorf("save config file: %v", err)
+		return fmt.Errorf("save config file: %v", err)
+	}
+	return nil
+}
+
+func createUpdateHook(repoPath string) error {
+	return git.SetUpdateHook(repoPath,
+		fmt.Sprintf(_TPL_UPDATE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf))
+}
+
+// Finish migrating repository and/or wiki with things that don't need to be done for mirrors.
+func CleanUpMigrateInfo(repo *Repository) (*Repository, error) {
+	repoPath := repo.RepoPath()
+	if err := createUpdateHook(repoPath); err != nil {
+		return repo, fmt.Errorf("createUpdateHook: %v", err)
+	}
+	if repo.HasWiki() {
+		if err := createUpdateHook(repo.WikiPath()); err != nil {
+			return repo, fmt.Errorf("createUpdateHook (wiki): %v", err)
+		}
+	}
+
+	if err := cleanUpMigrateGitConfig(repo.GitConfigPath()); err != nil {
+		return repo, fmt.Errorf("cleanUpMigrateGitConfig: %v", err)
+	}
+	if repo.HasWiki() {
+		if err := cleanUpMigrateGitConfig(path.Join(repo.WikiPath(), "config")); err != nil {
+			return repo, fmt.Errorf("cleanUpMigrateGitConfig (wiki): %v", err)
+		}
 	}
 
 	return repo, UpdateRepository(repo, false)
@@ -771,7 +750,7 @@ func initRepoCommit(tmpPath string, sig *git.Signature) (err error) {
 	if _, stderr, err = process.ExecDir(-1,
 		tmpPath, fmt.Sprintf("initRepoCommit (git commit): %s", tmpPath),
 		"git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
-		"-m", "initial commit"); err != nil {
+		"-m", "Initial commit"); err != nil {
 		return fmt.Errorf("git commit: %s", stderr)
 	}
 
@@ -795,7 +774,7 @@ type CreateRepoOptions struct {
 }
 
 func getRepoInitFile(tp, name string) ([]byte, error) {
-	relPath := path.Join("conf", tp, name)
+	relPath := path.Join("conf", tp, strings.TrimLeft(name, "./"))
 
 	// Use custom file when available.
 	customPath := path.Join(setting.CustomPath, relPath)
@@ -1081,7 +1060,7 @@ func RepoPath(userName, repoName string) string {
 }
 
 // TransferOwnership transfers all corresponding setting from old user to new one.
-func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
+func TransferOwnership(doer *User, newOwnerName string, repo *Repository) error {
 	newOwner, err := GetUserByName(newOwnerName)
 	if err != nil {
 		return fmt.Errorf("get new owner '%s': %v", newOwnerName, err)
@@ -1104,7 +1083,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
 	owner := repo.Owner
 
 	// Note: we have to set value here to make sure recalculate accesses is based on
-	//	new owner.
+	// new owner.
 	repo.OwnerID = newOwner.ID
 	repo.Owner = newOwner
 
@@ -1174,7 +1153,7 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
 
 	if err = watchRepo(sess, newOwner.ID, repo.ID, true); err != nil {
 		return fmt.Errorf("watchRepo: %v", err)
-	} else if err = transferRepoAction(sess, u, owner, newOwner, repo); err != nil {
+	} else if err = transferRepoAction(sess, doer, owner, repo); err != nil {
 		return fmt.Errorf("transferRepoAction: %v", err)
 	}
 
@@ -1268,6 +1247,20 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
 			}
 		}
 
+		// Create/Remove git-daemon-export-ok for git-daemon...
+		daemonExportFile := path.Join(repo.RepoPath(), `git-daemon-export-ok`)
+		if repo.IsPrivate && com.IsExist(daemonExportFile) {
+			if err = os.Remove(daemonExportFile); err != nil {
+				log.Error(4, "Failed to remove %s: %v", daemonExportFile, err)
+			}
+		} else if !repo.IsPrivate && !com.IsExist(daemonExportFile) {
+			if f, err := os.Create(daemonExportFile); err != nil {
+				log.Error(4, "Failed to create %s: %v", daemonExportFile, err)
+			} else {
+				f.Close()
+			}
+		}
+
 		forkRepos, err := getRepositoriesByForkID(e, repo.ID)
 		if err != nil {
 			return fmt.Errorf("getRepositoriesByForkID: %v", err)
@@ -1430,16 +1423,16 @@ func GetRepositoryByRef(ref string) (*Repository, error) {
 }
 
 // GetRepositoryByName returns the repository by given name under user if exists.
-func GetRepositoryByName(uid int64, repoName string) (*Repository, error) {
+func GetRepositoryByName(ownerID int64, name string) (*Repository, error) {
 	repo := &Repository{
-		OwnerID:   uid,
-		LowerName: strings.ToLower(repoName),
+		OwnerID:   ownerID,
+		LowerName: strings.ToLower(name),
 	}
 	has, err := x.Get(repo)
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrRepoNotExist{0, uid, repoName}
+		return nil, ErrRepoNotExist{0, ownerID, name}
 	}
 	return repo, err
 }
@@ -1621,40 +1614,8 @@ func RewriteRepositoryUpdateHook() error {
 		})
 }
 
-// statusPool represents a pool of status with true/false.
-type statusPool struct {
-	lock sync.RWMutex
-	pool map[string]bool
-}
-
-// Start sets value of given name to true in the pool.
-func (p *statusPool) Start(name string) {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	p.pool[name] = true
-}
-
-// Stop sets value of given name to false in the pool.
-func (p *statusPool) Stop(name string) {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	p.pool[name] = false
-}
-
-// IsRunning checks if value of given name is set to true in the pool.
-func (p *statusPool) IsRunning(name string) bool {
-	p.lock.RLock()
-	defer p.lock.RUnlock()
-
-	return p.pool[name]
-}
-
 // Prevent duplicate running tasks.
-var taskStatusPool = &statusPool{
-	pool: make(map[string]bool),
-}
+var taskStatusTable = sync.NewStatusTable()
 
 const (
 	_MIRROR_UPDATE = "mirror_update"
@@ -1662,64 +1623,13 @@ const (
 	_CHECK_REPOs   = "check_repos"
 )
 
-// MirrorUpdate checks and updates mirror repositories.
-func MirrorUpdate() {
-	if taskStatusPool.IsRunning(_MIRROR_UPDATE) {
-		return
-	}
-	taskStatusPool.Start(_MIRROR_UPDATE)
-	defer taskStatusPool.Stop(_MIRROR_UPDATE)
-
-	log.Trace("Doing: MirrorUpdate")
-
-	mirrors := make([]*Mirror, 0, 10)
-	if err := x.Where("next_update_unix<=?", time.Now().Unix()).Iterate(new(Mirror), func(idx int, bean interface{}) error {
-		m := bean.(*Mirror)
-		if m.Repo == nil {
-			log.Error(4, "Disconnected mirror repository found: %d", m.ID)
-			return nil
-		}
-
-		repoPath := m.Repo.RepoPath()
-
-		gitArgs := []string{"remote", "update"}
-		if m.EnablePrune {
-			gitArgs = append(gitArgs, "--prune")
-		}
-
-		if _, stderr, err := process.ExecDir(
-			time.Duration(setting.Git.Timeout.Mirror)*time.Second,
-			repoPath, fmt.Sprintf("MirrorUpdate: %s", repoPath),
-			"git", gitArgs...); err != nil {
-			desc := fmt.Sprintf("Fail to update mirror repository(%s): %s", repoPath, stderr)
-			log.Error(4, desc)
-			if err = CreateRepositoryNotice(desc); err != nil {
-				log.Error(4, "CreateRepositoryNotice: %v", err)
-			}
-			return nil
-		}
-
-		m.NextUpdate = time.Now().Add(time.Duration(m.Interval) * time.Hour)
-		mirrors = append(mirrors, m)
-		return nil
-	}); err != nil {
-		log.Error(4, "MirrorUpdate: %v", err)
-	}
-
-	for i := range mirrors {
-		if err := UpdateMirror(mirrors[i]); err != nil {
-			log.Error(4, "UpdateMirror[%d]: %v", mirrors[i].ID, err)
-		}
-	}
-}
-
 // GitFsck calls 'git fsck' to check repository health.
 func GitFsck() {
-	if taskStatusPool.IsRunning(_GIT_FSCK) {
+	if taskStatusTable.IsRunning(_GIT_FSCK) {
 		return
 	}
-	taskStatusPool.Start(_GIT_FSCK)
-	defer taskStatusPool.Stop(_GIT_FSCK)
+	taskStatusTable.Start(_GIT_FSCK)
+	defer taskStatusTable.Stop(_GIT_FSCK)
 
 	log.Trace("Doing: GitFsck")
 
@@ -1781,11 +1691,11 @@ func repoStatsCheck(checker *repoChecker) {
 }
 
 func CheckRepoStats() {
-	if taskStatusPool.IsRunning(_CHECK_REPOs) {
+	if taskStatusTable.IsRunning(_CHECK_REPOs) {
 		return
 	}
-	taskStatusPool.Start(_CHECK_REPOs)
-	defer taskStatusPool.Stop(_CHECK_REPOs)
+	taskStatusTable.Start(_CHECK_REPOs)
+	defer taskStatusTable.Stop(_CHECK_REPOs)
 
 	log.Trace("Doing: CheckRepoStats")
 
@@ -2169,3 +2079,34 @@ func (repo *Repository) GetForks() ([]*Repository, error) {
 	forks := make([]*Repository, 0, repo.NumForks)
 	return forks, x.Find(&forks, &Repository{ForkID: repo.ID})
 }
+
+// __________                             .__
+// \______   \____________    ____   ____ |  |__
+//  |    |  _/\_  __ \__  \  /    \_/ ___\|  |  \
+//  |    |   \ |  | \// __ \|   |  \  \___|   Y  \
+//  |______  / |__|  (____  /___|  /\___  >___|  /
+//         \/             \/     \/     \/     \/
+//
+
+func (repo *Repository) CreateNewBranch(doer *User, oldBranchName, branchName string) (err error) {
+	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
+	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
+
+	localPath := repo.LocalCopyPath()
+
+	if err = discardLocalRepoBranchChanges(localPath, oldBranchName); err != nil {
+		return fmt.Errorf("discardLocalRepoChanges: %v", err)
+	} else if err = repo.UpdateLocalCopyBranch(oldBranchName); err != nil {
+		return fmt.Errorf("UpdateLocalCopyBranch: %v", err)
+	}
+
+	if err = repo.CheckoutNewBranch(oldBranchName, branchName); err != nil {
+		return fmt.Errorf("CreateNewBranch: %v", err)
+	}
+
+	if err = git.Push(localPath, "origin", branchName); err != nil {
+		return fmt.Errorf("Push: %v", err)
+	}
+
+	return nil
+}

models/repo_collaboration.go

@@ -29,7 +29,7 @@ func (c *Collaboration) ModeI18nKey() string {
 	}
 }
 
-// AddCollaborator adds new collaboration relation between an individual and a repository.
+// AddCollaborator adds new collaboration to a repository with default access mode.
 func (repo *Repository) AddCollaborator(u *User) error {
 	collaboration := &Collaboration{
 		RepoID: repo.ID,
@@ -120,6 +120,9 @@ func (repo *Repository) ChangeCollaborationAccessMode(uid int64, mode AccessMode
 		return nil
 	}
 
+	if collaboration.Mode == mode {
+		return nil
+	}
 	collaboration.Mode = mode
 
 	sess := x.NewSession()

models/repo_editor.go

@@ -0,0 +1,520 @@
+// Copyright 2016 The Gogs 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 models
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"mime/multipart"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+	"time"
+
+	"github.com/Unknwon/com"
+	gouuid "github.com/satori/go.uuid"
+
+	git "github.com/gogits/git-module"
+
+	"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/gogs/modules/process"
+	"github.com/gogits/gogs/modules/setting"
+)
+
+// ___________    .___.__  __    ___________.__.__
+// \_   _____/  __| _/|__|/  |_  \_   _____/|__|  |   ____
+//  |    __)_  / __ | |  \   __\  |    __)  |  |  | _/ __ \
+//  |        \/ /_/ | |  ||  |    |     \   |  |  |_\  ___/
+// /_______  /\____ | |__||__|    \___  /   |__|____/\___  >
+//         \/      \/                 \/                 \/
+
+// discardLocalRepoBranchChanges discards local commits/changes of
+// given branch to make sure it is even to remote branch.
+func discardLocalRepoBranchChanges(localPath, branch string) error {
+	if !com.IsExist(localPath) {
+		return nil
+	}
+	// No need to check if nothing in the repository.
+	if !git.IsBranchExist(localPath, branch) {
+		return nil
+	}
+
+	refName := "origin/" + branch
+	if err := git.ResetHEAD(localPath, true, refName); err != nil {
+		return fmt.Errorf("git reset --hard %s: %v", refName, err)
+	}
+	return nil
+}
+
+func (repo *Repository) DiscardLocalRepoBranchChanges(branch string) error {
+	return discardLocalRepoBranchChanges(repo.LocalCopyPath(), branch)
+}
+
+// checkoutNewBranch checks out to a new branch from the a branch name.
+func checkoutNewBranch(repoPath, localPath, oldBranch, newBranch string) error {
+	if err := git.Checkout(localPath, git.CheckoutOptions{
+		Timeout:   time.Duration(setting.Git.Timeout.Pull) * time.Second,
+		Branch:    newBranch,
+		OldBranch: oldBranch,
+	}); err != nil {
+		return fmt.Errorf("git checkout -b %s %s: %v", newBranch, oldBranch, err)
+	}
+	return nil
+}
+
+func (repo *Repository) CheckoutNewBranch(oldBranch, newBranch string) error {
+	return checkoutNewBranch(repo.RepoPath(), repo.LocalCopyPath(), oldBranch, newBranch)
+}
+
+type UpdateRepoFileOptions struct {
+	LastCommitID string
+	OldBranch    string
+	NewBranch    string
+	OldTreeName  string
+	NewTreeName  string
+	Message      string
+	Content      string
+	IsNewFile    bool
+}
+
+// UpdateRepoFile adds or updates a file in repository.
+func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (err error) {
+	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
+	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
+
+	if err = repo.DiscardLocalRepoBranchChanges(opts.OldBranch); err != nil {
+		return fmt.Errorf("DiscardLocalRepoBranchChanges [branch: %s]: %v", opts.OldBranch, err)
+	} else if err = repo.UpdateLocalCopyBranch(opts.OldBranch); err != nil {
+		return fmt.Errorf("UpdateLocalCopyBranch [branch: %s]: %v", opts.OldBranch, err)
+	}
+
+	if opts.OldBranch != opts.NewBranch {
+		if err := repo.CheckoutNewBranch(opts.OldBranch, opts.NewBranch); err != nil {
+			return fmt.Errorf("CheckoutNewBranch [old_branch: %s, new_branch: %s]: %v", opts.OldBranch, opts.NewBranch, err)
+		}
+	}
+
+	localPath := repo.LocalCopyPath()
+	oldFilePath := path.Join(localPath, opts.OldTreeName)
+	filePath := path.Join(localPath, opts.NewTreeName)
+	os.MkdirAll(path.Dir(filePath), os.ModePerm)
+
+	// If it's meant to be a new file, make sure it doesn't exist.
+	if opts.IsNewFile {
+		if com.IsExist(filePath) {
+			return ErrRepoFileAlreadyExist{filePath}
+		}
+	}
+
+	// Ignore move step if it's a new file under a directory.
+	// Otherwise, move the file when name changed.
+	if com.IsFile(oldFilePath) && opts.OldTreeName != opts.NewTreeName {
+		if err = git.MoveFile(localPath, opts.OldTreeName, opts.NewTreeName); err != nil {
+			return fmt.Errorf("git mv %s %s: %v", opts.OldTreeName, opts.NewTreeName, err)
+		}
+	}
+
+	if err = ioutil.WriteFile(filePath, []byte(opts.Content), 0666); err != nil {
+		return fmt.Errorf("WriteFile: %v", err)
+	}
+
+	if err = git.AddChanges(localPath, true); err != nil {
+		return fmt.Errorf("git add --all: %v", err)
+	} else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
+		Committer: doer.NewGitSig(),
+		Message:   opts.Message,
+	}); err != nil {
+		return fmt.Errorf("CommitChanges: %v", err)
+	} else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil {
+		return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
+	}
+
+	gitRepo, err := git.OpenRepository(repo.RepoPath())
+	if err != nil {
+		log.Error(4, "OpenRepository: %v", err)
+		return nil
+	}
+	commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
+	if err != nil {
+		log.Error(4, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
+		return nil
+	}
+
+	// Simulate push event.
+	pushCommits := &PushCommits{
+		Len:     1,
+		Commits: []*PushCommit{CommitToPushCommit(commit)},
+	}
+	oldCommitID := opts.LastCommitID
+	if opts.NewBranch != opts.OldBranch {
+		oldCommitID = git.EMPTY_SHA
+	}
+	if err := CommitRepoAction(CommitRepoActionOptions{
+		PusherName:  doer.Name,
+		RepoOwnerID: repo.MustOwner().ID,
+		RepoName:    repo.Name,
+		RefFullName: git.BRANCH_PREFIX + opts.NewBranch,
+		OldCommitID: oldCommitID,
+		NewCommitID: commit.ID.String(),
+		Commits:     pushCommits,
+	}); err != nil {
+		log.Error(4, "CommitRepoAction: %v", err)
+		return nil
+	}
+
+	return nil
+}
+
+// GetDiffPreview produces and returns diff result of a file which is not yet committed.
+func (repo *Repository) GetDiffPreview(branch, treePath, content string) (diff *Diff, err error) {
+	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
+	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
+
+	if err = repo.DiscardLocalRepoBranchChanges(branch); err != nil {
+		return nil, fmt.Errorf("DiscardLocalRepoBranchChanges [branch: %s]: %v", branch, err)
+	} else if err = repo.UpdateLocalCopyBranch(branch); err != nil {
+		return nil, fmt.Errorf("UpdateLocalCopyBranch [branch: %s]: %v", branch, err)
+	}
+
+	localPath := repo.LocalCopyPath()
+	filePath := path.Join(localPath, treePath)
+	os.MkdirAll(filepath.Dir(filePath), os.ModePerm)
+	if err = ioutil.WriteFile(filePath, []byte(content), 0666); err != nil {
+		return nil, fmt.Errorf("WriteFile: %v", err)
+	}
+
+	cmd := exec.Command("git", "diff", treePath)
+	cmd.Dir = localPath
+	cmd.Stderr = os.Stderr
+
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("StdoutPipe: %v", err)
+	}
+
+	if err = cmd.Start(); err != nil {
+		return nil, fmt.Errorf("Start: %v", err)
+	}
+
+	pid := process.Add(fmt.Sprintf("GetDiffPreview [repo_path: %s]", repo.RepoPath()), cmd)
+	defer process.Remove(pid)
+
+	diff, err = ParsePatch(setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, stdout)
+	if err != nil {
+		return nil, fmt.Errorf("ParsePatch: %v", err)
+	}
+
+	if err = cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("Wait: %v", err)
+	}
+
+	return diff, nil
+}
+
+// ________         .__          __           ___________.__.__
+// \______ \   ____ |  |   _____/  |_  ____   \_   _____/|__|  |   ____
+//  |    |  \_/ __ \|  | _/ __ \   __\/ __ \   |    __)  |  |  | _/ __ \
+//  |    `   \  ___/|  |_\  ___/|  | \  ___/   |     \   |  |  |_\  ___/
+// /_______  /\___  >____/\___  >__|  \___  >  \___  /   |__|____/\___  >
+//         \/     \/          \/          \/       \/                 \/
+//
+
+type DeleteRepoFileOptions struct {
+	LastCommitID string
+	OldBranch    string
+	NewBranch    string
+	TreePath     string
+	Message      string
+}
+
+func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) (err error) {
+	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
+	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
+
+	if err = repo.DiscardLocalRepoBranchChanges(opts.OldBranch); err != nil {
+		return fmt.Errorf("DiscardLocalRepoBranchChanges [branch: %s]: %v", opts.OldBranch, err)
+	} else if err = repo.UpdateLocalCopyBranch(opts.OldBranch); err != nil {
+		return fmt.Errorf("UpdateLocalCopyBranch [branch: %s]: %v", opts.OldBranch, err)
+	}
+
+	if opts.OldBranch != opts.NewBranch {
+		if err := repo.CheckoutNewBranch(opts.OldBranch, opts.NewBranch); err != nil {
+			return fmt.Errorf("CheckoutNewBranch [old_branch: %s, new_branch: %s]: %v", opts.OldBranch, opts.NewBranch, err)
+		}
+	}
+
+	localPath := repo.LocalCopyPath()
+	if err = os.Remove(path.Join(localPath, opts.TreePath)); err != nil {
+		return fmt.Errorf("Remove: %v", err)
+	}
+
+	if err = git.AddChanges(localPath, true); err != nil {
+		return fmt.Errorf("git add --all: %v", err)
+	} else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
+		Committer: doer.NewGitSig(),
+		Message:   opts.Message,
+	}); err != nil {
+		return fmt.Errorf("CommitChanges: %v", err)
+	} else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil {
+		return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
+	}
+
+	gitRepo, err := git.OpenRepository(repo.RepoPath())
+	if err != nil {
+		log.Error(4, "OpenRepository: %v", err)
+		return nil
+	}
+	commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
+	if err != nil {
+		log.Error(4, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
+		return nil
+	}
+
+	// Simulate push event.
+	pushCommits := &PushCommits{
+		Len:     1,
+		Commits: []*PushCommit{CommitToPushCommit(commit)},
+	}
+	if err := CommitRepoAction(CommitRepoActionOptions{
+		PusherName:  doer.Name,
+		RepoOwnerID: repo.MustOwner().ID,
+		RepoName:    repo.Name,
+		RefFullName: git.BRANCH_PREFIX + opts.NewBranch,
+		OldCommitID: opts.LastCommitID,
+		NewCommitID: commit.ID.String(),
+		Commits:     pushCommits,
+	}); err != nil {
+		log.Error(4, "CommitRepoAction: %v", err)
+		return nil
+	}
+
+	return nil
+}
+
+//  ____ ___        .__                    .___ ___________.___.__
+// |    |   \______ |  |   _________     __| _/ \_   _____/|   |  |   ____   ______
+// |    |   /\____ \|  |  /  _ \__  \   / __ |   |    __)  |   |  | _/ __ \ /  ___/
+// |    |  / |  |_> >  |_(  <_> ) __ \_/ /_/ |   |     \   |   |  |_\  ___/ \___ \
+// |______/  |   __/|____/\____(____  /\____ |   \___  /   |___|____/\___  >____  >
+//           |__|                   \/      \/       \/                  \/     \/
+//
+
+// Upload represent a uploaded file to a repo to be deleted when moved
+type Upload struct {
+	ID   int64  `xorm:"pk autoincr"`
+	UUID string `xorm:"uuid UNIQUE"`
+	Name string
+}
+
+// UploadLocalPath returns where uploads is stored in local file system based on given UUID.
+func UploadLocalPath(uuid string) string {
+	return path.Join(setting.Repository.Upload.TempPath, uuid[0:1], uuid[1:2], uuid)
+}
+
+// LocalPath returns where uploads are temporarily stored in local file system.
+func (upload *Upload) LocalPath() string {
+	return UploadLocalPath(upload.UUID)
+}
+
+// NewUpload creates a new upload object.
+func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err error) {
+	upload := &Upload{
+		UUID: gouuid.NewV4().String(),
+		Name: name,
+	}
+
+	localPath := upload.LocalPath()
+	if err = os.MkdirAll(path.Dir(localPath), os.ModePerm); err != nil {
+		return nil, fmt.Errorf("MkdirAll: %v", err)
+	}
+
+	fw, err := os.Create(localPath)
+	if err != nil {
+		return nil, fmt.Errorf("Create: %v", err)
+	}
+	defer fw.Close()
+
+	if _, err = fw.Write(buf); err != nil {
+		return nil, fmt.Errorf("Write: %v", err)
+	} else if _, err = io.Copy(fw, file); err != nil {
+		return nil, fmt.Errorf("Copy: %v", err)
+	}
+
+	if _, err := x.Insert(upload); err != nil {
+		return nil, err
+	}
+
+	return upload, nil
+}
+
+func GetUploadByUUID(uuid string) (*Upload, error) {
+	upload := &Upload{UUID: uuid}
+	has, err := x.Get(upload)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrUploadNotExist{0, uuid}
+	}
+	return upload, nil
+}
+
+func GetUploadsByUUIDs(uuids []string) ([]*Upload, error) {
+	if len(uuids) == 0 {
+		return []*Upload{}, nil
+	}
+
+	// Silently drop invalid uuids.
+	uploads := make([]*Upload, 0, len(uuids))
+	return uploads, x.In("uuid", uuids).Find(&uploads)
+}
+
+func DeleteUploads(uploads ...*Upload) (err error) {
+	if len(uploads) == 0 {
+		return nil
+	}
+
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	ids := make([]int64, len(uploads))
+	for i := 0; i < len(uploads); i++ {
+		ids[i] = uploads[i].ID
+	}
+	if _, err = sess.In("id", ids).Delete(new(Upload)); err != nil {
+		return fmt.Errorf("delete uploads: %v", err)
+	}
+
+	for _, upload := range uploads {
+		localPath := upload.LocalPath()
+		if !com.IsFile(localPath) {
+			continue
+		}
+
+		if err := os.Remove(localPath); err != nil {
+			return fmt.Errorf("remove upload: %v", err)
+		}
+	}
+
+	return sess.Commit()
+}
+
+func DeleteUpload(u *Upload) error {
+	return DeleteUploads(u)
+}
+
+func DeleteUploadByUUID(uuid string) error {
+	upload, err := GetUploadByUUID(uuid)
+	if err != nil {
+		if IsErrUploadNotExist(err) {
+			return nil
+		}
+		return fmt.Errorf("GetUploadByUUID: %v", err)
+	}
+
+	if err := DeleteUpload(upload); err != nil {
+		return fmt.Errorf("DeleteUpload: %v", err)
+	}
+
+	return nil
+}
+
+type UploadRepoFileOptions struct {
+	LastCommitID string
+	OldBranch    string
+	NewBranch    string
+	TreePath     string
+	Message      string
+	Files        []string // In UUID format.
+}
+
+func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions) (err error) {
+	if len(opts.Files) == 0 {
+		return nil
+	}
+
+	uploads, err := GetUploadsByUUIDs(opts.Files)
+	if err != nil {
+		return fmt.Errorf("GetUploadsByUUIDs [uuids: %v]: %v", opts.Files, err)
+	}
+
+	repoWorkingPool.CheckIn(com.ToStr(repo.ID))
+	defer repoWorkingPool.CheckOut(com.ToStr(repo.ID))
+
+	if err = repo.DiscardLocalRepoBranchChanges(opts.OldBranch); err != nil {
+		return fmt.Errorf("DiscardLocalRepoBranchChanges [branch: %s]: %v", opts.OldBranch, err)
+	} else if err = repo.UpdateLocalCopyBranch(opts.OldBranch); err != nil {
+		return fmt.Errorf("UpdateLocalCopyBranch [branch: %s]: %v", opts.OldBranch, err)
+	}
+
+	if opts.OldBranch != opts.NewBranch {
+		if err = repo.CheckoutNewBranch(opts.OldBranch, opts.NewBranch); err != nil {
+			return fmt.Errorf("CheckoutNewBranch [old_branch: %s, new_branch: %s]: %v", opts.OldBranch, opts.NewBranch, err)
+		}
+	}
+
+	localPath := repo.LocalCopyPath()
+	dirPath := path.Join(localPath, opts.TreePath)
+	os.MkdirAll(dirPath, os.ModePerm)
+
+	// Copy uploaded files into repository.
+	for _, upload := range uploads {
+		tmpPath := upload.LocalPath()
+		targetPath := path.Join(dirPath, upload.Name)
+		if !com.IsFile(tmpPath) {
+			continue
+		}
+
+		if err = com.Copy(tmpPath, targetPath); err != nil {
+			return fmt.Errorf("Copy: %v", err)
+		}
+	}
+
+	if err = git.AddChanges(localPath, true); err != nil {
+		return fmt.Errorf("git add --all: %v", err)
+	} else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
+		Committer: doer.NewGitSig(),
+		Message:   opts.Message,
+	}); err != nil {
+		return fmt.Errorf("CommitChanges: %v", err)
+	} else if err = git.Push(localPath, "origin", opts.NewBranch); err != nil {
+		return fmt.Errorf("git push origin %s: %v", opts.NewBranch, err)
+	}
+
+	gitRepo, err := git.OpenRepository(repo.RepoPath())
+	if err != nil {
+		log.Error(4, "OpenRepository: %v", err)
+		return nil
+	}
+	commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
+	if err != nil {
+		log.Error(4, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
+		return nil
+	}
+
+	// Simulate push event.
+	pushCommits := &PushCommits{
+		Len:     1,
+		Commits: []*PushCommit{CommitToPushCommit(commit)},
+	}
+	if err := CommitRepoAction(CommitRepoActionOptions{
+		PusherName:  doer.Name,
+		RepoOwnerID: repo.MustOwner().ID,
+		RepoName:    repo.Name,
+		RefFullName: git.BRANCH_PREFIX + opts.NewBranch,
+		OldCommitID: opts.LastCommitID,
+		NewCommitID: commit.ID.String(),
+		Commits:     pushCommits,
+	}); err != nil {
+		log.Error(4, "CommitRepoAction: %v", err)
+		return nil
+	}
+
+	return DeleteUploads(uploads...)
+}

models/repo_mirror.go

@@ -0,0 +1,243 @@
+// Copyright 2016 The Gogs 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 models
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/Unknwon/com"
+	"github.com/go-xorm/xorm"
+	"gopkg.in/ini.v1"
+
+	"github.com/gogits/gogs/modules/log"
+	"github.com/gogits/gogs/modules/process"
+	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/modules/sync"
+)
+
+var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)
+
+// Mirror represents mirror information of a repository.
+type Mirror struct {
+	ID          int64 `xorm:"pk autoincr"`
+	RepoID      int64
+	Repo        *Repository `xorm:"-"`
+	Interval    int         // Hour.
+	EnablePrune bool        `xorm:"NOT NULL DEFAULT true"`
+
+	Updated        time.Time `xorm:"-"`
+	UpdatedUnix    int64
+	NextUpdate     time.Time `xorm:"-"`
+	NextUpdateUnix int64
+
+	address string `xorm:"-"`
+}
+
+func (m *Mirror) BeforeInsert() {
+	m.NextUpdateUnix = m.NextUpdate.Unix()
+}
+
+func (m *Mirror) BeforeUpdate() {
+	m.UpdatedUnix = time.Now().Unix()
+	m.NextUpdateUnix = m.NextUpdate.Unix()
+}
+
+func (m *Mirror) AfterSet(colName string, _ xorm.Cell) {
+	var err error
+	switch colName {
+	case "repo_id":
+		m.Repo, err = GetRepositoryByID(m.RepoID)
+		if err != nil {
+			log.Error(3, "GetRepositoryByID[%d]: %v", m.ID, err)
+		}
+	case "updated_unix":
+		m.Updated = time.Unix(m.UpdatedUnix, 0).Local()
+	case "next_updated_unix":
+		m.NextUpdate = time.Unix(m.NextUpdateUnix, 0).Local()
+	}
+}
+
+// ScheduleNextUpdate calculates and sets next update time.
+func (m *Mirror) ScheduleNextUpdate() {
+	m.NextUpdate = time.Now().Add(time.Duration(m.Interval) * time.Hour)
+}
+
+func (m *Mirror) readAddress() {
+	if len(m.address) > 0 {
+		return
+	}
+
+	cfg, err := ini.Load(m.Repo.GitConfigPath())
+	if err != nil {
+		log.Error(4, "Load: %v", err)
+		return
+	}
+	m.address = cfg.Section("remote \"origin\"").Key("url").Value()
+}
+
+// HandleCloneUserCredentials replaces user credentials from HTTP/HTTPS URL
+// with placeholder <credentials>.
+// It will fail for any other forms of clone addresses.
+func HandleCloneUserCredentials(url string, mosaics bool) string {
+	i := strings.Index(url, "@")
+	if i == -1 {
+		return url
+	}
+	start := strings.Index(url, "://")
+	if start == -1 {
+		return url
+	}
+	if mosaics {
+		return url[:start+3] + "<credentials>" + url[i:]
+	}
+	return url[:start+3] + url[i+1:]
+}
+
+// Address returns mirror address from Git repository config without credentials.
+func (m *Mirror) Address() string {
+	m.readAddress()
+	return HandleCloneUserCredentials(m.address, false)
+}
+
+// FullAddress returns mirror address from Git repository config.
+func (m *Mirror) FullAddress() string {
+	m.readAddress()
+	return m.address
+}
+
+// SaveAddress writes new address to Git repository config.
+func (m *Mirror) SaveAddress(addr string) error {
+	configPath := m.Repo.GitConfigPath()
+	cfg, err := ini.Load(configPath)
+	if err != nil {
+		return fmt.Errorf("Load: %v", err)
+	}
+
+	cfg.Section("remote \"origin\"").Key("url").SetValue(addr)
+	return cfg.SaveToIndent(configPath, "\t")
+}
+
+// runSync returns true if sync finished without error.
+func (m *Mirror) runSync() bool {
+	repoPath := m.Repo.RepoPath()
+	wikiPath := m.Repo.WikiPath()
+	timeout := time.Duration(setting.Git.Timeout.Mirror) * time.Second
+
+	gitArgs := []string{"remote", "update"}
+	if m.EnablePrune {
+		gitArgs = append(gitArgs, "--prune")
+	}
+
+	if _, stderr, err := process.ExecDir(
+		timeout, repoPath, fmt.Sprintf("Mirror.runSync: %s", repoPath),
+		"git", gitArgs...); err != nil {
+		desc := fmt.Sprintf("Fail to update mirror repository '%s': %s", repoPath, stderr)
+		log.Error(4, desc)
+		if err = CreateRepositoryNotice(desc); err != nil {
+			log.Error(4, "CreateRepositoryNotice: %v", err)
+		}
+		return false
+	}
+	if m.Repo.HasWiki() {
+		if _, stderr, err := process.ExecDir(
+			timeout, wikiPath, fmt.Sprintf("Mirror.runSync: %s", wikiPath),
+			"git", "remote", "update", "--prune"); err != nil {
+			desc := fmt.Sprintf("Fail to update mirror wiki repository '%s': %s", wikiPath, stderr)
+			log.Error(4, desc)
+			if err = CreateRepositoryNotice(desc); err != nil {
+				log.Error(4, "CreateRepositoryNotice: %v", err)
+			}
+			return false
+		}
+	}
+
+	return true
+}
+
+func getMirrorByRepoID(e Engine, repoID int64) (*Mirror, error) {
+	m := &Mirror{RepoID: repoID}
+	has, err := e.Get(m)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrMirrorNotExist
+	}
+	return m, nil
+}
+
+// GetMirrorByRepoID returns mirror information of a repository.
+func GetMirrorByRepoID(repoID int64) (*Mirror, error) {
+	return getMirrorByRepoID(x, repoID)
+}
+
+func updateMirror(e Engine, m *Mirror) error {
+	_, err := e.Id(m.ID).AllCols().Update(m)
+	return err
+}
+
+func UpdateMirror(m *Mirror) error {
+	return updateMirror(x, m)
+}
+
+func DeleteMirrorByRepoID(repoID int64) error {
+	_, err := x.Delete(&Mirror{RepoID: repoID})
+	return err
+}
+
+// MirrorUpdate checks and updates mirror repositories.
+func MirrorUpdate() {
+	if taskStatusTable.IsRunning(_MIRROR_UPDATE) {
+		return
+	}
+	taskStatusTable.Start(_MIRROR_UPDATE)
+	defer taskStatusTable.Stop(_MIRROR_UPDATE)
+
+	log.Trace("Doing: MirrorUpdate")
+
+	if err := x.Where("next_update_unix<=?", time.Now().Unix()).Iterate(new(Mirror), func(idx int, bean interface{}) error {
+		m := bean.(*Mirror)
+		if m.Repo == nil {
+			log.Error(4, "Disconnected mirror repository found: %d", m.ID)
+			return nil
+		}
+
+		MirrorQueue.Add(m.RepoID)
+		return nil
+	}); err != nil {
+		log.Error(4, "MirrorUpdate: %v", err)
+	}
+}
+
+// SyncMirrors checks and syncs mirrors.
+// TODO: sync more mirrors at same time.
+func SyncMirrors() {
+	// Start listening on new sync requests.
+	for repoID := range MirrorQueue.Queue() {
+		log.Trace("SyncMirrors [repo_id: %v]", repoID)
+		MirrorQueue.Remove(repoID)
+
+		m, err := GetMirrorByRepoID(com.StrTo(repoID).MustInt64())
+		if err != nil {
+			log.Error(4, "GetMirrorByRepoID [%d]: %v", repoID, err)
+			continue
+		}
+
+		if !m.runSync() {
+			continue
+		}
+
+		m.ScheduleNextUpdate()
+		if err = UpdateMirror(m); err != nil {
+			log.Error(4, "UpdateMirror [%d]: %v", repoID, err)
+			continue
+		}
+	}
+}
+
+func InitSyncMirrors() {
+	go SyncMirrors()
+}

models/ssh_key_test.go

@@ -1,7 +1,12 @@
+// Copyright 2016 The Gogs 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 models
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	. "github.com/smartystreets/goconvey/convey"
@@ -24,7 +29,7 @@ func Test_SSHParsePublicKey(t *testing.T) {
 		"rsa-2048":  {"rsa", 2048, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMZXh+1OBUwSH9D45wTaxErQIN9IoC9xl7MKJkqvTvv6O5RR9YW/IK9FbfjXgXsppYGhsCZo1hFOOsXHMnfOORqu/xMDx4yPuyvKpw4LePEcg4TDipaDFuxbWOqc/BUZRZcXu41QAWfDLrInwsltWZHSeG7hjhpacl4FrVv9V1pS6Oc5Q1NxxEzTzuNLS/8diZrTm/YAQQ/+B+mzWI3zEtF4miZjjAljWd1LTBPvU23d29DcBmmFahcZ441XZsTeAwGxG/Q6j8NgNXj9WxMeWwxXV2jeAX/EBSpZrCVlCQ1yJswT6xCp8TuBnTiGWYMBNTbOZvPC4e0WI2/yZW/s5F nocomment"},
 		"ecdsa-256": {"ecdsa", 256, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQacN3PrOll7PXmN5B/ZNVahiUIqI05nbBlZk1KXsO3d06ktAWqbNflv2vEmA38bTFTfJ2sbn2B5ksT52cDDbA= nocomment"},
 		"ecdsa-384": {"ecdsa", 384, "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBINmioV+XRX1Fm9Qk2ehHXJ2tfVxW30ypUWZw670Zyq5GQfBAH6xjygRsJ5wWsHXBsGYgFUXIHvMKVAG1tpw7s6ax9oA+dJOJ7tj+vhn8joFqT+sg3LYHgZkHrfqryRasQ== nocomment"},
-		"ecdsa-521": {"ecdsa", 521, "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACGt3UG3EzRwNOI17QR84l6PgiAcvCE7v6aXPj/SC6UWKg4EL8vW9ZBcdYL9wzs4FZXh4MOV8jAzu3KRWNTwb4k2wFNUpGOt7l28MztFFEtH5BDDrtAJSPENPy8pvPLMfnPg5NhvWycqIBzNcHipem5wSJFN5PdpNOC2xMrPWKNqj+ZjQ== nocomment"},
+		// "ecdsa-521": {"ecdsa", 521, "ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACGt3UG3EzRwNOI17QR84l6PgiAcvCE7v6aXPj/SC6UWKg4EL8vW9ZBcdYL9wzs4FZXh4MOV8jAzu3KRWNTwb4k2wFNUpGOt7l28MztFFEtH5BDDrtAJSPENPy8pvPLMfnPg5NhvWycqIBzNcHipem5wSJFN5PdpNOC2xMrPWKNqj+ZjQ== nocomment"},
 	}
 
 	Convey("Parse public keys in both native and ssh-keygen", t, func() {
@@ -37,7 +42,13 @@ func Test_SSHParsePublicKey(t *testing.T) {
 			So(lengthN, ShouldEqual, key.length)
 
 			keyTypeK, lengthK, errK := SSHKeyGenParsePublicKey(key.content)
-			So(errK, ShouldBeNil)
+			if errK != nil {
+				// Some server just does not support ecdsa format.
+				if strings.Contains(errK.Error(), "line 1 too long:") {
+					continue
+				}
+				So(errK, ShouldBeNil)
+			}
 			So(keyTypeK, ShouldEqual, key.typeName)
 			So(lengthK, ShouldEqual, key.length)
 		}

models/update.go

@@ -47,6 +47,19 @@ func DeleteUpdateTaskByUUID(uuid string) error {
 	return err
 }
 
+// CommitToPushCommit transforms a git.Commit to PushCommit type.
+func CommitToPushCommit(commit *git.Commit) *PushCommit {
+	return &PushCommit{
+		Sha1:           commit.ID.String(),
+		Message:        commit.Message(),
+		AuthorEmail:    commit.Author.Email,
+		AuthorName:     commit.Author.Name,
+		CommitterEmail: commit.Committer.Email,
+		CommitterName:  commit.Committer.Name,
+		Timestamp:      commit.Author.When,
+	}
+}
+
 func ListToPushCommits(l *list.List) *PushCommits {
 	commits := make([]*PushCommit, 0)
 	var actEmail string
@@ -55,37 +68,28 @@ func ListToPushCommits(l *list.List) *PushCommits {
 		if actEmail == "" {
 			actEmail = commit.Committer.Email
 		}
-		commits = append(commits,
-			&PushCommit{
-				Sha1:           commit.ID.String(),
-				Message:        commit.Message(),
-				AuthorEmail:    commit.Author.Email,
-				AuthorName:     commit.Author.Name,
-				CommitterEmail: commit.Committer.Email,
-				CommitterName:  commit.Committer.Name,
-				Timestamp:      commit.Author.When,
-			})
+		commits = append(commits, CommitToPushCommit(commit))
 	}
 	return &PushCommits{l.Len(), commits, "", nil}
 }
 
 type PushUpdateOptions struct {
-	RefName      string
-	OldCommitID  string
-	NewCommitID  string
 	PusherID     int64
 	PusherName   string
 	RepoUserName string
 	RepoName     string
+	RefFullName  string
+	OldCommitID  string
+	NewCommitID  string
 }
 
 // PushUpdate must be called for any push actions in order to
 // generates necessary push action history feeds.
 func PushUpdate(opts PushUpdateOptions) (err error) {
-	isNewRef := strings.HasPrefix(opts.OldCommitID, "0000000")
-	isDelRef := strings.HasPrefix(opts.NewCommitID, "0000000")
+	isNewRef := opts.OldCommitID == git.EMPTY_SHA
+	isDelRef := opts.NewCommitID == git.EMPTY_SHA
 	if isNewRef && isDelRef {
-		return fmt.Errorf("Old and new revisions both start with 000000")
+		return fmt.Errorf("Old and new revisions are both %s", git.EMPTY_SHA)
 	}
 
 	repoPath := RepoPath(opts.RepoUserName, opts.RepoName)
@@ -98,7 +102,7 @@ func PushUpdate(opts PushUpdateOptions) (err error) {
 
 	if isDelRef {
 		log.GitLogger.Info("Reference '%s' has been deleted from '%s/%s' by %d",
-			opts.RefName, opts.RepoUserName, opts.RepoName, opts.PusherName)
+			opts.RefFullName, opts.RepoUserName, opts.RepoName, opts.PusherName)
 		return nil
 	}
 
@@ -107,41 +111,30 @@ func PushUpdate(opts PushUpdateOptions) (err error) {
 		return fmt.Errorf("OpenRepository: %v", err)
 	}
 
-	repoUser, err := GetUserByName(opts.RepoUserName)
+	owner, err := GetUserByName(opts.RepoUserName)
 	if err != nil {
 		return fmt.Errorf("GetUserByName: %v", err)
 	}
 
-	repo, err := GetRepositoryByName(repoUser.ID, opts.RepoName)
+	repo, err := GetRepositoryByName(owner.ID, opts.RepoName)
 	if err != nil {
 		return fmt.Errorf("GetRepositoryByName: %v", err)
 	}
 
 	// Push tags.
-	if strings.HasPrefix(opts.RefName, "refs/tags/") {
-		tag, err := gitRepo.GetTag(git.RefEndName(opts.RefName))
-		if err != nil {
-			return fmt.Errorf("gitRepo.GetTag: %v", err)
-		}
-
-		// When tagger isn't available, fall back to get committer email.
-		var actEmail string
-		if tag.Tagger != nil {
-			actEmail = tag.Tagger.Email
-		} else {
-			cmt, err := tag.Commit()
-			if err != nil {
-				return fmt.Errorf("tag.Commit: %v", err)
-			}
-			actEmail = cmt.Committer.Email
-		}
-
-		commit := &PushCommits{}
-		if err = CommitRepoAction(opts.PusherID, repoUser.ID, opts.PusherName, actEmail,
-			repo.ID, opts.RepoUserName, opts.RepoName, opts.RefName, commit, opts.OldCommitID, opts.NewCommitID); err != nil {
+	if strings.HasPrefix(opts.RefFullName, git.TAG_PREFIX) {
+		if err := CommitRepoAction(CommitRepoActionOptions{
+			PusherName:  opts.PusherName,
+			RepoOwnerID: owner.ID,
+			RepoName:    repo.Name,
+			RefFullName: opts.RefFullName,
+			OldCommitID: opts.OldCommitID,
+			NewCommitID: opts.NewCommitID,
+			Commits:     &PushCommits{},
+		}); err != nil {
 			return fmt.Errorf("CommitRepoAction (tag): %v", err)
 		}
-		return err
+		return nil
 	}
 
 	newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
@@ -163,9 +156,15 @@ func PushUpdate(opts PushUpdateOptions) (err error) {
 		}
 	}
 
-	if err = CommitRepoAction(opts.PusherID, repoUser.ID, opts.PusherName, repoUser.Email,
-		repo.ID, opts.RepoUserName, opts.RepoName, opts.RefName, ListToPushCommits(l),
-		opts.OldCommitID, opts.NewCommitID); err != nil {
+	if err := CommitRepoAction(CommitRepoActionOptions{
+		PusherName:  opts.PusherName,
+		RepoOwnerID: owner.ID,
+		RepoName:    repo.Name,
+		RefFullName: opts.RefFullName,
+		OldCommitID: opts.OldCommitID,
+		NewCommitID: opts.NewCommitID,
+		Commits:     ListToPushCommits(l),
+	}); err != nil {
 		return fmt.Errorf("CommitRepoAction (branch): %v", err)
 	}
 	return nil

models/user.go

@@ -25,6 +25,7 @@ import (
 	"github.com/nfnt/resize"
 
 	"github.com/gogits/git-module"
+	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/modules/avatar"
 	"github.com/gogits/gogs/modules/base"
@@ -45,7 +46,6 @@ var (
 	ErrEmailNotExist         = errors.New("E-mail does not exist")
 	ErrEmailNotActivated     = errors.New("E-mail address has not been activated")
 	ErrUserNameIllegal       = errors.New("User name contains illegal characters")
-	ErrLoginSourceNotExist   = errors.New("Login source does not exist")
 	ErrLoginSourceNotActived = errors.New("Login source is not actived")
 	ErrUnsupportedLoginType  = errors.New("Login source is unknown")
 )
@@ -130,6 +130,16 @@ func (u *User) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
+func (u *User) APIFormat() *api.User {
+	return &api.User{
+		ID:        u.ID,
+		UserName:  u.Name,
+		FullName:  u.FullName,
+		Email:     u.Email,
+		AvatarUrl: u.AvatarLink(),
+	}
+}
+
 // returns true if user login type is LOGIN_PLAIN.
 func (u *User) IsLocal() bool {
 	return u.LoginType <= LOGIN_PLAIN
@@ -297,7 +307,7 @@ func (u *User) GetFollowing(page int) ([]*User, error) {
 // NewGitSig generates and returns the signature of given user.
 func (u *User) NewGitSig() *git.Signature {
 	return &git.Signature{
-		Name:  u.Name,
+		Name:  u.DisplayName(),
 		Email: u.Email,
 		When:  time.Now(),
 	}
@@ -468,12 +478,12 @@ func GetUserSalt() string {
 	return base.GetRandomString(10)
 }
 
-// NewFakeUser creates and returns a fake user for someone has deleted his/her account.
-func NewFakeUser() *User {
+// NewGhostUser creates and returns a fake user for someone has deleted his/her account.
+func NewGhostUser() *User {
 	return &User{
 		ID:        -1,
-		Name:      "Someone",
-		LowerName: "someone",
+		Name:      "Ghost",
+		LowerName: "ghost",
 	}
 }
 

models/webhook.go

@@ -10,10 +10,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"strings"
-	"sync"
 	"time"
 
-	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
 
@@ -22,8 +20,11 @@ import (
 	"github.com/gogits/gogs/modules/httplib"
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/modules/sync"
 )
 
+var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)
+
 type HookContentType int
 
 const (
@@ -58,8 +59,9 @@ func IsValidHookContentType(name string) bool {
 }
 
 type HookEvents struct {
-	Create bool `json:"create"`
-	Push   bool `json:"push"`
+	Create      bool `json:"create"`
+	Push        bool `json:"push"`
+	PullRequest bool `json:"pull_request"`
 }
 
 // HookEvent represents events that will delivery hook.
@@ -157,14 +159,23 @@ func (w *Webhook) HasPushEvent() bool {
 		(w.ChooseEvents && w.HookEvents.Push)
 }
 
+// HasPullRequestEvent returns true if hook enabled pull request event.
+func (w *Webhook) HasPullRequestEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.HookEvents.PullRequest)
+}
+
 func (w *Webhook) EventsArray() []string {
-	events := make([]string, 0, 2)
+	events := make([]string, 0, 3)
 	if w.HasCreateEvent() {
 		events = append(events, "create")
 	}
 	if w.HasPushEvent() {
 		events = append(events, "push")
 	}
+	if w.HasPullRequestEvent() {
+		events = append(events, "pull_request")
+	}
 	return events
 }
 
@@ -203,15 +214,18 @@ func GetWebhookByOrgID(orgID, id int64) (*Webhook, error) {
 }
 
 // GetActiveWebhooksByRepoID returns all active webhooks of repository.
-func GetActiveWebhooksByRepoID(repoID int64) (ws []*Webhook, err error) {
-	err = x.Where("repo_id=?", repoID).And("is_active=?", true).Find(&ws)
-	return ws, err
+func GetActiveWebhooksByRepoID(repoID int64) ([]*Webhook, error) {
+	webhooks := make([]*Webhook, 0, 5)
+	return webhooks, x.Find(&webhooks, &Webhook{
+		RepoID:   repoID,
+		IsActive: true,
+	})
 }
 
-// GetWebhooksByRepoID returns all webhooks of repository.
-func GetWebhooksByRepoID(repoID int64) (ws []*Webhook, err error) {
-	err = x.Find(&ws, &Webhook{RepoID: repoID})
-	return ws, err
+// GetWebhooksByRepoID returns all webhooks of a repository.
+func GetWebhooksByRepoID(repoID int64) ([]*Webhook, error) {
+	webhooks := make([]*Webhook, 0, 5)
+	return webhooks, x.Find(&webhooks, &Webhook{RepoID: repoID})
 }
 
 // UpdateWebhook updates information of webhook.
@@ -309,8 +323,9 @@ func IsValidHookTaskType(name string) bool {
 type HookEventType string
 
 const (
-	HOOK_EVENT_CREATE HookEventType = "create"
-	HOOK_EVENT_PUSH   HookEventType = "push"
+	HOOK_EVENT_CREATE       HookEventType = "create"
+	HOOK_EVENT_PUSH         HookEventType = "push"
+	HOOK_EVENT_PULL_REQUEST HookEventType = "pull_request"
 )
 
 // HookRequest represents hook task request information.
@@ -422,17 +437,13 @@ func UpdateHookTask(t *HookTask) error {
 
 // PrepareWebhooks adds new webhooks to task queue for given payload.
 func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) error {
-	if err := repo.GetOwner(); err != nil {
-		return fmt.Errorf("GetOwner: %v", err)
-	}
-
 	ws, err := GetActiveWebhooksByRepoID(repo.ID)
 	if err != nil {
 		return fmt.Errorf("GetActiveWebhooksByRepoID: %v", err)
 	}
 
 	// check if repo belongs to org and append additional webhooks
-	if repo.Owner.IsOrganization() {
+	if repo.MustOwner().IsOrganization() {
 		// get hooks for org
 		orgws, err := GetActiveWebhooksByOrgID(repo.OwnerID)
 		if err != nil {
@@ -456,6 +467,10 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err
 			if !w.HasPushEvent() {
 				continue
 			}
+		case HOOK_EVENT_PULL_REQUEST:
+			if !w.HasPullRequestEvent() {
+				continue
+			}
 		}
 
 		// Use separate objects so modifcations won't be made on payload on non-Gogs type hooks.
@@ -477,7 +492,7 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err
 			URL:         w.URL,
 			Payloader:   payloader,
 			ContentType: w.ContentType,
-			EventType:   HOOK_EVENT_PUSH,
+			EventType:   event,
 			IsSSL:       w.IsSSL,
 		}); err != nil {
 			return fmt.Errorf("CreateHookTask: %v", err)
@@ -486,64 +501,6 @@ func PrepareWebhooks(repo *Repository, event HookEventType, p api.Payloader) err
 	return nil
 }
 
-// UniqueQueue represents a queue that guarantees only one instance of same ID is in the line.
-type UniqueQueue struct {
-	lock sync.Mutex
-	ids  map[string]bool
-
-	queue chan string
-}
-
-func (q *UniqueQueue) Queue() <-chan string {
-	return q.queue
-}
-
-func NewUniqueQueue(queueLength int) *UniqueQueue {
-	if queueLength <= 0 {
-		queueLength = 100
-	}
-
-	return &UniqueQueue{
-		ids:   make(map[string]bool),
-		queue: make(chan string, queueLength),
-	}
-}
-
-func (q *UniqueQueue) Remove(id interface{}) {
-	q.lock.Lock()
-	defer q.lock.Unlock()
-	delete(q.ids, com.ToStr(id))
-}
-
-func (q *UniqueQueue) AddFunc(id interface{}, fn func()) {
-	newid := com.ToStr(id)
-
-	if q.Exist(id) {
-		return
-	}
-
-	q.lock.Lock()
-	q.ids[newid] = true
-	if fn != nil {
-		fn()
-	}
-	q.lock.Unlock()
-	q.queue <- newid
-}
-
-func (q *UniqueQueue) Add(id interface{}) {
-	q.AddFunc(id, nil)
-}
-
-func (q *UniqueQueue) Exist(id interface{}) bool {
-	q.lock.Lock()
-	defer q.lock.Unlock()
-
-	return q.ids[com.ToStr(id)]
-}
-
-var HookQueue = NewUniqueQueue(setting.Webhook.QueueLength)
-
 func (t *HookTask) deliver() {
 	t.IsDelivered = true
 
@@ -640,7 +597,7 @@ func DeliverHooks() {
 
 	// Start listening on new hook requests.
 	for repoID := range HookQueue.Queue() {
-		log.Trace("DeliverHooks [%v]: processing delivery hooks", repoID)
+		log.Trace("DeliverHooks [repo_id: %v]", repoID)
 		HookQueue.Remove(repoID)
 
 		tasks = make([]*HookTask, 0, 5)

models/webhook_slack.go

@@ -12,6 +12,8 @@ import (
 
 	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/modules/setting"
 )
 
 type SlackMeta struct {
@@ -34,6 +36,7 @@ type SlackPayload struct {
 type SlackAttachment struct {
 	Fallback string `json:"fallback"`
 	Color    string `json:"color"`
+	Title    string `json:"title"`
 	Text     string `json:"text"`
 }
 
@@ -49,13 +52,20 @@ func (p *SlackPayload) JSONPayload() ([]byte, error) {
 
 // see: https://api.slack.com/docs/formatting
 func SlackTextFormatter(s string) string {
-	// take only first line of commit
-	first := strings.Split(s, "\n")[0]
 	// replace & < >
-	first = strings.Replace(first, "&", "&amp;", -1)
-	first = strings.Replace(first, "<", "&lt;", -1)
-	first = strings.Replace(first, ">", "&gt;", -1)
-	return first
+	s = strings.Replace(s, "&", "&amp;", -1)
+	s = strings.Replace(s, "<", "&lt;", -1)
+	s = strings.Replace(s, ">", "&gt;", -1)
+	return s
+}
+
+func SlackShortTextFormatter(s string) string {
+	s = strings.Split(s, "\n")[0]
+	// replace & < >
+	s = strings.Replace(s, "&", "&amp;", -1)
+	s = strings.Replace(s, "<", "&lt;", -1)
+	s = strings.Replace(s, ">", "&gt;", -1)
+	return s
 }
 
 func SlackLinkFormatter(url string, text string) string {
@@ -66,8 +76,8 @@ func getSlackCreatePayload(p *api.CreatePayload, slack *SlackMeta) (*SlackPayloa
 	// created tag/branch
 	refName := git.RefEndName(p.Ref)
 
-	repoLink := SlackLinkFormatter(p.Repo.URL, p.Repo.Name)
-	refLink := SlackLinkFormatter(p.Repo.URL+"/src/"+refName, refName)
+	repoLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.Name)
+	refLink := SlackLinkFormatter(p.Repo.HTMLURL+"/src/"+refName, refName)
 	text := fmt.Sprintf("[%s:%s] %s created by %s", repoLink, refLink, p.RefType, p.Sender.UserName)
 
 	return &SlackPayload{
@@ -91,37 +101,83 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
 	} else {
 		commitDesc = fmt.Sprintf("%d new commits", len(p.Commits))
 	}
-	if len(p.CompareUrl) > 0 {
-		commitString = SlackLinkFormatter(p.CompareUrl, commitDesc)
+	if len(p.CompareURL) > 0 {
+		commitString = SlackLinkFormatter(p.CompareURL, commitDesc)
 	} else {
 		commitString = commitDesc
 	}
 
-	repoLink := SlackLinkFormatter(p.Repo.URL, p.Repo.Name)
-	branchLink := SlackLinkFormatter(p.Repo.URL+"/src/"+branchName, branchName)
-	text := fmt.Sprintf("[%s:%s] %s pushed by %s", repoLink, branchLink, commitString, p.Pusher.Name)
+	repoLink := SlackLinkFormatter(p.Repo.HTMLURL, p.Repo.Name)
+	branchLink := SlackLinkFormatter(p.Repo.HTMLURL+"/src/"+branchName, branchName)
+	text := fmt.Sprintf("[%s:%s] %s pushed by %s", repoLink, branchLink, commitString, p.Pusher.UserName)
 
 	var attachmentText string
 	// for each commit, generate attachment text
 	for i, commit := range p.Commits {
-		attachmentText += fmt.Sprintf("%s: %s - %s", SlackLinkFormatter(commit.URL, commit.ID[:7]), SlackTextFormatter(commit.Message), SlackTextFormatter(commit.Author.Name))
+		attachmentText += fmt.Sprintf("%s: %s - %s", SlackLinkFormatter(commit.URL, commit.ID[:7]), SlackShortTextFormatter(commit.Message), SlackTextFormatter(commit.Author.Name))
 		// add linebreak to each commit but the last
 		if i < len(p.Commits)-1 {
 			attachmentText += "\n"
 		}
 	}
 
-	slackAttachments := []SlackAttachment{{
-		Color: slack.Color,
-		Text:  attachmentText,
-	}}
+	return &SlackPayload{
+		Channel:  slack.Channel,
+		Text:     text,
+		Username: slack.Username,
+		IconURL:  slack.IconURL,
+		Attachments: []SlackAttachment{{
+			Color: slack.Color,
+			Text:  attachmentText,
+		}},
+	}, nil
+}
+
+func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*SlackPayload, error) {
+	senderLink := SlackLinkFormatter(setting.AppUrl+p.Sender.UserName, p.Sender.UserName)
+	titleLink := SlackLinkFormatter(fmt.Sprintf("%s/pulls/%d", p.Repository.HTMLURL, p.Index),
+		fmt.Sprintf("#%d %s", p.Index, p.PullRequest.Title))
+	var text, title, attachmentText string
+	switch p.Action {
+	case api.HOOK_ISSUE_OPENED:
+		text = fmt.Sprintf("[%s] Pull request submitted by %s", p.Repository.FullName, senderLink)
+		title = titleLink
+		attachmentText = SlackTextFormatter(p.PullRequest.Body)
+	case api.HOOK_ISSUE_CLOSED:
+		if p.PullRequest.HasMerged {
+			text = fmt.Sprintf("[%s] Pull request merged: %s by %s", p.Repository.FullName, titleLink, senderLink)
+		} else {
+			text = fmt.Sprintf("[%s] Pull request closed: %s by %s", p.Repository.FullName, titleLink, senderLink)
+		}
+	case api.HOOK_ISSUE_REOPENED:
+		text = fmt.Sprintf("[%s] Pull request re-opened: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_EDITED:
+		text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink)
+		attachmentText = SlackTextFormatter(p.PullRequest.Body)
+	case api.HOOK_ISSUE_ASSIGNED:
+		text = fmt.Sprintf("[%s] Pull request assigned to %s: %s by %s", p.Repository.FullName,
+			SlackLinkFormatter(setting.AppUrl+p.PullRequest.Assignee.UserName, p.PullRequest.Assignee.UserName),
+			titleLink, senderLink)
+	case api.HOOK_ISSUE_UNASSIGNED:
+		text = fmt.Sprintf("[%s] Pull request unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_LABEL_UPDATED:
+		text = fmt.Sprintf("[%s] Pull request labels updated: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_LABEL_CLEARED:
+		text = fmt.Sprintf("[%s] Pull request labels cleared: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_SYNCHRONIZED:
+		text = fmt.Sprintf("[%s] Pull request synchronized: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	}
 
 	return &SlackPayload{
-		Channel:     slack.Channel,
-		Text:        text,
-		Username:    slack.Username,
-		IconURL:     slack.IconURL,
-		Attachments: slackAttachments,
+		Channel:  slack.Channel,
+		Text:     text,
+		Username: slack.Username,
+		IconURL:  slack.IconURL,
+		Attachments: []SlackAttachment{{
+			Color: slack.Color,
+			Title: title,
+			Text:  attachmentText,
+		}},
 	}, nil
 }
 
@@ -138,6 +194,8 @@ func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (*SlackP
 		return getSlackCreatePayload(p.(*api.CreatePayload), slack)
 	case HOOK_EVENT_PUSH:
 		return getSlackPushPayload(p.(*api.PushPayload), slack)
+	case HOOK_EVENT_PULL_REQUEST:
+		return getSlackPullRequestPayload(p.(*api.PullRequestPayload), slack)
 	}
 
 	return s, nil

models/wiki.go

@@ -12,57 +12,16 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
-	"sync"
 
 	"github.com/Unknwon/com"
 
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/modules/sync"
 )
 
-// workingPool represents a pool of working status which makes sure
-// that only one instance of same task is performing at a time.
-// However, different type of tasks can performing at the same time.
-type workingPool struct {
-	lock  sync.Mutex
-	pool  map[string]*sync.Mutex
-	count map[string]int
-}
-
-// CheckIn checks in a task and waits if others are running.
-func (p *workingPool) CheckIn(name string) {
-	p.lock.Lock()
-
-	lock, has := p.pool[name]
-	if !has {
-		lock = &sync.Mutex{}
-		p.pool[name] = lock
-	}
-	p.count[name]++
-
-	p.lock.Unlock()
-	lock.Lock()
-}
-
-// CheckOut checks out a task to let other tasks run.
-func (p *workingPool) CheckOut(name string) {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-
-	p.pool[name].Unlock()
-	if p.count[name] == 1 {
-		delete(p.pool, name)
-		delete(p.count, name)
-	} else {
-		p.count[name]--
-	}
-}
-
-var wikiWorkingPool = &workingPool{
-	pool:  make(map[string]*sync.Mutex),
-	count: make(map[string]int),
-}
+var wikiWorkingPool = sync.NewExclusivePool()
 
 // ToWikiPageURL formats a string to corresponding wiki URL name.
 func ToWikiPageURL(name string) string {
@@ -105,6 +64,8 @@ func (repo *Repository) InitWiki() error {
 
 	if err := git.InitRepository(repo.WikiPath(), true); err != nil {
 		return fmt.Errorf("InitRepository: %v", err)
+	} else if err = createUpdateHook(repo.WikiPath()); err != nil {
+		return fmt.Errorf("createUpdateHook: %v", err)
 	}
 	return nil
 }
@@ -115,24 +76,13 @@ func (repo *Repository) LocalWikiPath() string {
 
 // UpdateLocalWiki makes sure the local copy of repository wiki is up-to-date.
 func (repo *Repository) UpdateLocalWiki() error {
-	return updateLocalCopy(repo.WikiPath(), repo.LocalWikiPath())
+	// Don't pass branch name here because it fails to clone and
+	// checkout to a specific branch when wiki is an empty repository.
+	return UpdateLocalCopyBranch(repo.WikiPath(), repo.LocalWikiPath(), "")
 }
 
-// discardLocalWikiChanges discards local commits make sure
-// it is even to remote branch when local copy exists.
 func discardLocalWikiChanges(localPath string) error {
-	if !com.IsExist(localPath) {
-		return nil
-	}
-	// No need to check if nothing in the repository.
-	if !git.IsBranchExist(localPath, "master") {
-		return nil
-	}
-
-	if err := git.ResetHEAD(localPath, true, "origin/master"); err != nil {
-		return fmt.Errorf("ResetHEAD: %v", err)
-	}
-	return nil
+	return discardLocalRepoBranchChanges(localPath, "master")
 }
 
 // updateWikiPage adds new page to repository wiki.
@@ -179,7 +129,10 @@ func (repo *Repository) updateWikiPage(doer *User, oldTitle, title, content, mes
 	}
 	if err = git.AddChanges(localPath, true); err != nil {
 		return fmt.Errorf("AddChanges: %v", err)
-	} else if err = git.CommitChanges(localPath, message, doer.NewGitSig()); err != nil {
+	} else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
+		Committer: doer.NewGitSig(),
+		Message:   message,
+	}); err != nil {
 		return fmt.Errorf("CommitChanges: %v", err)
 	} else if err = git.Push(localPath, "origin", "master"); err != nil {
 		return fmt.Errorf("Push: %v", err)
@@ -215,7 +168,10 @@ func (repo *Repository) DeleteWikiPage(doer *User, title string) (err error) {
 
 	if err = git.AddChanges(localPath, true); err != nil {
 		return fmt.Errorf("AddChanges: %v", err)
-	} else if err = git.CommitChanges(localPath, message, doer.NewGitSig()); err != nil {
+	} else if err = git.CommitChanges(localPath, git.CommitChangesOptions{
+		Committer: doer.NewGitSig(),
+		Message:   message,
+	}); err != nil {
 		return fmt.Errorf("CommitChanges: %v", err)
 	} else if err = git.Push(localPath, "origin", "master"); err != nil {
 		return fmt.Errorf("Push: %v", err)

modules/auth/repo_form.go

@@ -113,10 +113,11 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
 //        \/       \/    \/     \/     \/            \/
 
 type WebhookForm struct {
-	Events string
-	Create bool
-	Push   bool
-	Active bool
+	Events      string
+	Create      bool
+	Push        bool
+	PullRequest bool
+	Active      bool
 }
 
 func (f WebhookForm) PushOnly() bool {
@@ -168,7 +169,7 @@ type CreateIssueForm struct {
 	MilestoneID int64
 	AssigneeID  int64
 	Content     string
-	Attachments []string
+	Files       []string
 }
 
 func (f *CreateIssueForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
@@ -176,9 +177,9 @@ func (f *CreateIssueForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
 }
 
 type CreateCommentForm struct {
-	Content     string
-	Status      string `binding:"OmitEmpty;In(reopen,close)"`
-	Attachments []string
+	Content string
+	Status  string `binding:"OmitEmpty;In(reopen,close)"`
+	Files   []string
 }
 
 func (f *CreateCommentForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
@@ -219,6 +220,14 @@ func (f *CreateLabelForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
 
+type InitializeLabelsForm struct {
+	TemplateName string `binding:"Required"`
+}
+
+func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
 // __________       .__
 // \______   \ ____ |  |   ____ _____    ______ ____
 //  |       _// __ \|  | _/ __ \\__  \  /  ___// __ \
@@ -268,3 +277,79 @@ type NewWikiForm struct {
 func (f *NewWikiForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
+
+// ___________    .___.__  __
+// \_   _____/  __| _/|__|/  |_
+//  |    __)_  / __ | |  \   __\
+//  |        \/ /_/ | |  ||  |
+// /_______  /\____ | |__||__|
+//         \/      \/
+
+type EditRepoFileForm struct {
+	TreePath      string `binding:"Required;MaxSize(500)"`
+	Content       string `binding:"Required"`
+	CommitSummary string `binding:"MaxSize(100)`
+	CommitMessage string
+	CommitChoice  string `binding:"Required;MaxSize(50)"`
+	NewBranchName string `binding:"AlphaDashDot;MaxSize(100)"`
+	LastCommit    string
+}
+
+func (f *EditRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
+type EditPreviewDiffForm struct {
+	Content string
+}
+
+func (f *EditPreviewDiffForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
+//  ____ ___        .__                    .___
+// |    |   \______ |  |   _________     __| _/
+// |    |   /\____ \|  |  /  _ \__  \   / __ |
+// |    |  / |  |_> >  |_(  <_> ) __ \_/ /_/ |
+// |______/  |   __/|____/\____(____  /\____ |
+//           |__|                   \/      \/
+//
+
+type UploadRepoFileForm struct {
+	TreePath      string `binding:MaxSize(500)"`
+	CommitSummary string `binding:"MaxSize(100)`
+	CommitMessage string
+	CommitChoice  string `binding:"Required;MaxSize(50)"`
+	NewBranchName string `binding:"AlphaDashDot;MaxSize(100)"`
+	Files         []string
+}
+
+func (f *UploadRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
+type RemoveUploadFileForm struct {
+	File string `binding:"Required;MaxSize(50)"`
+}
+
+func (f *RemoveUploadFileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
+
+// ________         .__          __
+// \______ \   ____ |  |   _____/  |_  ____
+// |    |  \_/ __ \|  | _/ __ \   __\/ __ \
+// |    `   \  ___/|  |_\  ___/|  | \  ___/
+// /_______  /\___  >____/\___  >__|  \___  >
+//         \/     \/          \/          \/
+
+type DeleteRepoFileForm struct {
+	CommitSummary string `binding:"MaxSize(100)`
+	CommitMessage string
+	CommitChoice  string `binding:"Required;MaxSize(50)"`
+	NewBranchName string `binding:"AlphaDashDot;MaxSize(100)"`
+}
+
+func (f *DeleteRepoFileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}

modules/base/tool.go

@@ -45,7 +45,7 @@ func EncodeSha1(str string) string {
 }
 
 func ShortSha(sha1 string) string {
-	if len(sha1) == 40 {
+	if len(sha1) > 10 {
 		return sha1[:10]
 	}
 	return sha1
@@ -518,26 +518,18 @@ func IsLetter(ch rune) bool {
 	return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= 0x80 && unicode.IsLetter(ch)
 }
 
-func IsTextFile(data []byte) (string, bool) {
-	contentType := http.DetectContentType(data)
-	if strings.Index(contentType, "text/") != -1 {
-		return contentType, true
+// IsTextFile returns true if file content format is plain text or empty.
+func IsTextFile(data []byte) bool {
+	if len(data) == 0 {
+		return true
 	}
-	return contentType, false
+	return strings.Index(http.DetectContentType(data), "text/") != -1
 }
 
-func IsImageFile(data []byte) (string, bool) {
-	contentType := http.DetectContentType(data)
-	if strings.Index(contentType, "image/") != -1 {
-		return contentType, true
-	}
-	return contentType, false
+func IsImageFile(data []byte) bool {
+	return strings.Index(http.DetectContentType(data), "image/") != -1
 }
 
-func IsPDFFile(data []byte) (string, bool) {
-	contentType := http.DetectContentType(data)
-	if strings.Index(contentType, "application/pdf") != -1 {
-		return contentType, true
-	}
-	return contentType, false
+func IsPDFFile(data []byte) bool {
+	return strings.Index(http.DetectContentType(data), "application/pdf") != -1
 }

modules/context/auth.go

@@ -37,8 +37,8 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 		}
 
 		// Check non-logged users landing page.
-		if !ctx.IsSigned && ctx.Req.RequestURI == "/" && setting.LandingPageUrl != setting.LANDING_PAGE_HOME {
-			ctx.Redirect(setting.AppSubUrl + string(setting.LandingPageUrl))
+		if !ctx.IsSigned && ctx.Req.RequestURI == "/" && setting.LandingPageURL != setting.LANDING_PAGE_HOME {
+			ctx.Redirect(setting.AppSubUrl + string(setting.LandingPageURL))
 			return
 		}
 

modules/context/context.go

@@ -105,13 +105,12 @@ func (ctx *Context) Handle(status int, title string, err error) {
 	ctx.HTML(status, base.TplName(fmt.Sprintf("status/%d", status)))
 }
 
-// HandleError use error check function to determine if server should
-// response as client input error or server internal error.
-// It responses with given status code for client error,
-// or error context description for logging purpose of server error.
-func (ctx *Context) HandleError(title string, errck func(error) bool, err error, status int) {
+// NotFoundOrServerError use error check function to determine if the error
+// is about not found. It responses with 404 status code for not found error,
+// or error context description for logging purpose of 500 server error.
+func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool, err error) {
 	if errck(err) {
-		ctx.Error(status, err.Error())
+		ctx.Handle(404, title, err)
 		return
 	}
 

modules/context/repo.go

@@ -6,10 +6,12 @@ package context
 
 import (
 	"fmt"
+	"io/ioutil"
 	"path"
 	"strings"
 
 	"github.com/Unknwon/com"
+	"gopkg.in/editorconfig/editorconfig-core-go.v1"
 	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/git-module"
@@ -39,7 +41,7 @@ type Repository struct {
 	GitRepo      *git.Repository
 	BranchName   string
 	TagName      string
-	TreeName     string
+	TreePath     string
 	CommitID     string
 	RepoLink     string
 	CloneLink    models.CloneLink
@@ -69,6 +71,33 @@ func (r *Repository) HasAccess() bool {
 	return r.AccessMode >= models.ACCESS_MODE_READ
 }
 
+// CanEnableEditor returns true if repository is editable and user has proper access level.
+func (r *Repository) CanEnableEditor() bool {
+	return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter()
+}
+
+// GetEditorconfig returns the .editorconfig definition if found in the
+// HEAD of the default repo branch.
+func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) {
+	commit, err := r.GitRepo.GetBranchCommit(r.Repository.DefaultBranch)
+	if err != nil {
+		return nil, err
+	}
+	treeEntry, err := commit.GetTreeEntryByPath(".editorconfig")
+	if err != nil {
+		return nil, err
+	}
+	reader, err := treeEntry.Blob().Data()
+	if err != nil {
+		return nil, err
+	}
+	data, err := ioutil.ReadAll(reader)
+	if err != nil {
+		return nil, err
+	}
+	return editorconfig.ParseBytes(data)
+}
+
 func RetrieveBaseRepo(ctx *Context, repo *models.Repository) {
 	// Non-fork repository will not return error in this method.
 	if err := repo.GetBaseRepo(); err != nil {
@@ -143,6 +172,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
 			}
 		}
 		ctx.Repo.Owner = owner
+		ctx.Data["Username"] = ctx.Repo.Owner.Name
 
 		// Get repository.
 		repo, err := models.GetRepositoryByName(owner.ID, repoName)
@@ -186,7 +216,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		ctx.Data["HasAccess"] = true
 
 		if repo.IsMirror {
-			ctx.Repo.Mirror, err = models.GetMirror(repo.ID)
+			ctx.Repo.Mirror, err = models.GetMirrorByRepoID(repo.ID)
 			if err != nil {
 				ctx.Handle(500, "GetMirror", err)
 				return
@@ -197,6 +227,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		}
 
 		ctx.Repo.Repository = repo
+		ctx.Data["RepoName"] = ctx.Repo.Repository.Name
 		ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare
 
 		gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName))
@@ -324,12 +355,11 @@ func RepoRef() macaron.Handler {
 		// For API calls.
 		if ctx.Repo.GitRepo == nil {
 			repoPath := models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
-			gitRepo, err := git.OpenRepository(repoPath)
+			ctx.Repo.GitRepo, err = git.OpenRepository(repoPath)
 			if err != nil {
 				ctx.Handle(500, "RepoRef Invalid repo "+repoPath, err)
 				return
 			}
-			ctx.Repo.GitRepo = gitRepo
 		}
 
 		// Get default branch.
@@ -360,7 +390,7 @@ func RepoRef() macaron.Handler {
 				if ctx.Repo.GitRepo.IsBranchExist(refName) ||
 					ctx.Repo.GitRepo.IsTagExist(refName) {
 					if i < len(parts)-1 {
-						ctx.Repo.TreeName = strings.Join(parts[i+1:], "/")
+						ctx.Repo.TreePath = strings.Join(parts[i+1:], "/")
 					}
 					hasMatched = true
 					break
@@ -368,7 +398,7 @@ func RepoRef() macaron.Handler {
 			}
 			if !hasMatched && len(parts[0]) == 40 {
 				refName = parts[0]
-				ctx.Repo.TreeName = strings.Join(parts[1:], "/")
+				ctx.Repo.TreePath = strings.Join(parts[1:], "/")
 			}
 
 			if ctx.Repo.GitRepo.IsBranchExist(refName) {
@@ -407,6 +437,7 @@ func RepoRef() macaron.Handler {
 		ctx.Repo.BranchName = refName
 		ctx.Data["BranchName"] = ctx.Repo.BranchName
 		ctx.Data["CommitID"] = ctx.Repo.CommitID
+		ctx.Data["TreePath"] = ctx.Repo.TreePath
 		ctx.Data["IsViewBranch"] = ctx.Repo.IsViewBranch
 		ctx.Data["IsViewTag"] = ctx.Repo.IsViewTag
 		ctx.Data["IsViewCommit"] = ctx.Repo.IsViewCommit

modules/mailer/mailer.go

@@ -126,8 +126,8 @@ func (s *Sender) Send(from string, to []string, msg io.WriterTo) error {
 		return fmt.Errorf("NewClient: %v", err)
 	}
 
-	if !setting.MailService.DisableHelo {
-		hostname := setting.MailService.HeloHostname
+	if !opts.DisableHelo {
+		hostname := opts.HeloHostname
 		if len(hostname) == 0 {
 			hostname, err = os.Hostname()
 			if err != nil {

modules/markdown/markdown.go

@@ -53,10 +53,11 @@ func isLink(link []byte) bool {
 // IsMarkdownFile reports whether name looks like a Markdown file
 // based on its extension.
 func IsMarkdownFile(name string) bool {
-	name = strings.ToLower(name)
-	switch filepath.Ext(name) {
-	case ".md", ".markdown", ".mdown", ".mkd":
-		return true
+	extension := strings.ToLower(filepath.Ext(name))
+	for _, ext := range setting.Markdown.FileExtensions {
+		if strings.ToLower(ext) == extension {
+			return true
+		}
 	}
 	return false
 }
@@ -90,6 +91,8 @@ var (
 	IssueAlphanumericPattern = regexp.MustCompile(`( |^|\()[A-Z]{1,10}-[1-9][0-9]*\b`)
 
 	// Sha1CurrentPattern matches string that represents a commit SHA, e.g. d8a994ef243349f321568f9e36d5c3f444b99cae
+	// FIXME: this pattern matches pure numbers as well, right now we do a hack to check in RenderSha1CurrentPattern
+	// by converting string to a number.
 	Sha1CurrentPattern = regexp.MustCompile(`\b[0-9a-f]{40}\b`)
 )
 
@@ -261,6 +264,9 @@ func RenderIssueIndexPattern(rawBytes []byte, urlPrefix string, metas map[string
 // RenderSha1CurrentPattern renders SHA1 strings to corresponding links that assumes in the same repository.
 func RenderSha1CurrentPattern(rawBytes []byte, urlPrefix string) []byte {
 	return []byte(Sha1CurrentPattern.ReplaceAllStringFunc(string(rawBytes[:]), func(m string) string {
+		if com.StrTo(m).MustInt() > 0 {
+			return m
+		}
 		return fmt.Sprintf(`<a href="%s/commit/%s"><code>%s</code></a>`, urlPrefix, m, base.ShortSha(string(m)))
 	}))
 }

modules/setting/setting.go

@@ -12,6 +12,7 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"strings"
 	"time"
 
@@ -31,9 +32,10 @@ import (
 type Scheme string
 
 const (
-	HTTP  Scheme = "http"
-	HTTPS Scheme = "https"
-	FCGI  Scheme = "fcgi"
+	HTTP        Scheme = "http"
+	HTTPS       Scheme = "https"
+	FCGI        Scheme = "fcgi"
+	UNIX_SOCKET Scheme = "unix"
 )
 
 type LandingPage string
@@ -44,7 +46,7 @@ const (
 )
 
 var (
-	// Build information
+	// Build information should only be set by -ldflags.
 	BuildTime    string
 	BuildGitHash string
 
@@ -58,16 +60,17 @@ var (
 	AppDataPath    string
 
 	// Server settings
-	Protocol           Scheme
-	Domain             string
-	HttpAddr, HttpPort string
-	LocalURL           string
-	OfflineMode        bool
-	DisableRouterLog   bool
-	CertFile, KeyFile  string
-	StaticRootPath     string
-	EnableGzip         bool
-	LandingPageUrl     LandingPage
+	Protocol             Scheme
+	Domain               string
+	HTTPAddr, HTTPPort   string
+	LocalURL             string
+	OfflineMode          bool
+	DisableRouterLog     bool
+	CertFile, KeyFile    string
+	StaticRootPath       string
+	EnableGzip           bool
+	LandingPageURL       LandingPage
+	UnixSocketPermission uint32
 
 	SSH struct {
 		Disabled            bool           `ini:"DISABLE_SSH"`
@@ -110,7 +113,24 @@ var (
 		AnsiCharset            string
 		ForcePrivate           bool
 		MaxCreationLimit       int
+		MirrorQueueLength      int
 		PullRequestQueueLength int
+		PreferredLicenses      []string
+
+		// Repository editor settings
+		Editor struct {
+			LineWrapExtensions   []string
+			PreviewableFileModes []string
+		} `ini:"-"`
+
+		// Repository upload settings
+		Upload struct {
+			Enabled      bool
+			TempPath     string
+			AllowedTypes []string `delim:"|"`
+			FileMaxSize  int64
+			MaxFiles     int
+		} `ini:"-"`
 	}
 	RepoRootPath string
 	ScriptType   string
@@ -138,6 +158,7 @@ var (
 	Markdown struct {
 		EnableHardLineBreak bool
 		CustomURLSchemes    []string `ini:"CUSTOM_URL_SCHEMES"`
+		FileExtensions      []string
 	}
 
 	// Picture settings
@@ -164,7 +185,7 @@ var (
 
 	// Cache settings
 	CacheAdapter  string
-	CacheInternal int
+	CacheInterval int
 	CacheConn     string
 
 	// Session settings
@@ -239,6 +260,7 @@ var (
 	HasRobotsTxt bool
 )
 
+// DateLang transforms standard language locale name to corresponding value in datetime plugin.
 func DateLang(lang string) string {
 	name, ok := dateLangs[lang]
 	if ok {
@@ -367,11 +389,19 @@ func NewContext() {
 		KeyFile = sec.Key("KEY_FILE").String()
 	} else if sec.Key("PROTOCOL").String() == "fcgi" {
 		Protocol = FCGI
+	} else if sec.Key("PROTOCOL").String() == "unix" {
+		Protocol = UNIX_SOCKET
+		UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666")
+		UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32)
+		if err != nil || UnixSocketPermissionParsed > 0777 {
+			log.Fatal(4, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw)
+		}
+		UnixSocketPermission = uint32(UnixSocketPermissionParsed)
 	}
 	Domain = sec.Key("DOMAIN").MustString("localhost")
-	HttpAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
-	HttpPort = sec.Key("HTTP_PORT").MustString("3000")
-	LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HttpPort + "/")
+	HTTPAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
+	HTTPPort = sec.Key("HTTP_PORT").MustString("3000")
+	LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/")
 	OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
 	DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
 	StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
@@ -380,9 +410,9 @@ func NewContext() {
 
 	switch sec.Key("LANDING_PAGE").MustString("home") {
 	case "explore":
-		LandingPageUrl = LANDING_PAGE_EXPLORE
+		LandingPageURL = LANDING_PAGE_EXPLORE
 	default:
-		LandingPageUrl = LANDING_PAGE_HOME
+		LandingPageURL = LANDING_PAGE_HOME
 	}
 
 	SSH.RootPath = path.Join(homeDir, ".ssh")
@@ -469,6 +499,14 @@ func NewContext() {
 	ScriptType = sec.Key("SCRIPT_TYPE").MustString("bash")
 	if err = Cfg.Section("repository").MapTo(&Repository); err != nil {
 		log.Fatal(4, "Fail to map Repository settings: %v", err)
+	} else if err = Cfg.Section("repository.editor").MapTo(&Repository.Editor); err != nil {
+		log.Fatal(4, "Fail to map Repository.Editor settings: %v", err)
+	} else if err = Cfg.Section("repository.upload").MapTo(&Repository.Upload); err != nil {
+		log.Fatal(4, "Fail to map Repository.Upload settings: %v", err)
+	}
+
+	if !filepath.IsAbs(Repository.Upload.TempPath) {
+		Repository.Upload.TempPath = path.Join(workDir, Repository.Upload.TempPath)
 	}
 
 	sec = Cfg.Section("picture")
@@ -518,7 +556,7 @@ func NewContext() {
 	} else if err = Cfg.Section("git").MapTo(&Git); err != nil {
 		log.Fatal(4, "Fail to map Git settings: %v", err)
 	} else if err = Cfg.Section("mirror").MapTo(&Mirror); err != nil {
-		log.Fatal(4, "Fail to map API settings: %v", err)
+		log.Fatal(4, "Fail to map Mirror settings: %v", err)
 	} else if err = Cfg.Section("api").MapTo(&API); err != nil {
 		log.Fatal(4, "Fail to map API settings: %v", err)
 	}
@@ -645,7 +683,7 @@ func newCacheService() {
 	CacheAdapter = Cfg.Section("cache").Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
 	switch CacheAdapter {
 	case "memory":
-		CacheInternal = Cfg.Section("cache").Key("INTERVAL").MustInt(60)
+		CacheInterval = Cfg.Section("cache").Key("INTERVAL").MustInt(60)
 	case "redis", "memcache":
 		CacheConn = strings.Trim(Cfg.Section("cache").Key("HOST").String(), "\" ")
 	default:

modules/sync/exclusive_pool.go

@@ -0,0 +1,70 @@
+// Copyright 2016 The Gogs 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 sync
+
+import (
+	"sync"
+)
+
+// ExclusivePool is a pool of non-identical instances
+// that only one instance with same identity is in the pool at a time.
+// In other words, only instances with different identities can be in
+// the pool the same time. If another instance with same identity tries
+// to get into the pool, it hangs until previous instance left the pool.
+//
+// This pool is particularly useful for performing tasks on same resource
+// on the file system in different goroutines.
+type ExclusivePool struct {
+	lock sync.Mutex
+
+	// pool maintains locks for each instance in the pool.
+	pool map[string]*sync.Mutex
+
+	// count maintains the number of times an instance with same identity checks in
+	// to the pool, and should be reduced to 0 (removed from map) by checking out
+	// with same number of times.
+	// The purpose of count is to delete lock when count down to 0 and recycle memory
+	// from map object.
+	count map[string]int
+}
+
+// NewExclusivePool initializes and returns a new ExclusivePool object.
+func NewExclusivePool() *ExclusivePool {
+	return &ExclusivePool{
+		pool:  make(map[string]*sync.Mutex),
+		count: make(map[string]int),
+	}
+}
+
+// CheckIn checks in an instance to the pool and hangs while instance
+// with same indentity is using the lock.
+func (p *ExclusivePool) CheckIn(identity string) {
+	p.lock.Lock()
+
+	lock, has := p.pool[identity]
+	if !has {
+		lock = &sync.Mutex{}
+		p.pool[identity] = lock
+	}
+	p.count[identity]++
+
+	p.lock.Unlock()
+	lock.Lock()
+}
+
+// CheckOut checks out an instance from the pool and releases the lock
+// to let other instances with same identity to grab the lock.
+func (p *ExclusivePool) CheckOut(identity string) {
+	p.lock.Lock()
+	defer p.lock.Unlock()
+
+	p.pool[identity].Unlock()
+	if p.count[identity] == 1 {
+		delete(p.pool, identity)
+		delete(p.count, identity)
+	} else {
+		p.count[identity]--
+	}
+}

modules/sync/status_pool.go

@@ -0,0 +1,49 @@
+// Copyright 2016 The Gogs 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 sync
+
+import (
+	"sync"
+)
+
+// StatusTable is a table maintains true/false values.
+//
+// This table is particularly useful for un/marking and checking values
+// in different goroutines.
+type StatusTable struct {
+	lock sync.RWMutex
+	pool map[string]bool
+}
+
+// NewStatusTable initializes and returns a new StatusTable object.
+func NewStatusTable() *StatusTable {
+	return &StatusTable{
+		pool: make(map[string]bool),
+	}
+}
+
+// Start sets value of given name to true in the pool.
+func (p *StatusTable) Start(name string) {
+	p.lock.Lock()
+	defer p.lock.Unlock()
+
+	p.pool[name] = true
+}
+
+// Stop sets value of given name to false in the pool.
+func (p *StatusTable) Stop(name string) {
+	p.lock.Lock()
+	defer p.lock.Unlock()
+
+	p.pool[name] = false
+}
+
+// IsRunning checks if value of given name is set to true in the pool.
+func (p *StatusTable) IsRunning(name string) bool {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+
+	return p.pool[name]
+}

modules/sync/unique_queue.go

@@ -0,0 +1,70 @@
+// Copyright 2016 The Gogs 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 sync
+
+import (
+	"github.com/Unknwon/com"
+)
+
+// UniqueQueue is a queue which guarantees only one instance of same
+// identity is in the line. Instances with same identity will be
+// discarded if there is already one in the line.
+//
+// This queue is particularly useful for preventing duplicated task
+// of same purpose.
+type UniqueQueue struct {
+	table *StatusTable
+	queue chan string
+}
+
+// NewUniqueQueue initializes and returns a new UniqueQueue object.
+func NewUniqueQueue(queueLength int) *UniqueQueue {
+	if queueLength <= 0 {
+		queueLength = 100
+	}
+
+	return &UniqueQueue{
+		table: NewStatusTable(),
+		queue: make(chan string, queueLength),
+	}
+}
+
+// Queue returns channel of queue for retrieving instances.
+func (q *UniqueQueue) Queue() <-chan string {
+	return q.queue
+}
+
+// Exist returns true if there is an instance with given indentity
+// exists in the queue.
+func (q *UniqueQueue) Exist(id interface{}) bool {
+	return q.table.IsRunning(com.ToStr(id))
+}
+
+// AddFunc adds new instance to the queue with a custom runnable function,
+// the queue is blocked until the function exits.
+func (q *UniqueQueue) AddFunc(id interface{}, fn func()) {
+	if q.Exist(id) {
+		return
+	}
+
+	idStr := com.ToStr(id)
+	q.table.lock.Lock()
+	q.table.pool[idStr] = true
+	if fn != nil {
+		fn()
+	}
+	q.table.lock.Unlock()
+	q.queue <- idStr
+}
+
+// Add adds new instance to the queue.
+func (q *UniqueQueue) Add(id interface{}) {
+	q.AddFunc(id, nil)
+}
+
+// Remove removes instance from the queue.
+func (q *UniqueQueue) Remove(id interface{}) {
+	q.table.Stop(com.ToStr(id))
+}

modules/template/template.go

@@ -9,12 +9,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"html/template"
+	"mime"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"time"
 
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/transform"
+	"gopkg.in/editorconfig/editorconfig-core-go.v1"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
@@ -70,13 +73,6 @@ func NewFuncMap() []template.FuncMap {
 			return t.Format("Jan 02, 2006")
 		},
 		"List": List,
-		"Mail2Domain": func(mail string) string {
-			if !strings.Contains(mail, "@") {
-				return "try.gogs.io"
-			}
-
-			return strings.SplitN(mail, "@", 2)[1]
-		},
 		"SubStr": func(str string, start, length int) string {
 			if len(str) == 0 {
 				return ""
@@ -90,6 +86,7 @@ func NewFuncMap() []template.FuncMap {
 			}
 			return str[start:end]
 		},
+		"EllipsisString":    base.EllipsisString,
 		"DiffTypeToStr":     DiffTypeToStr,
 		"DiffLineTypeToStr": DiffLineTypeToStr,
 		"Sha1":              Sha1,
@@ -103,6 +100,19 @@ func NewFuncMap() []template.FuncMap {
 		"ThemeColorMetaTag": func() string {
 			return setting.UI.ThemeColorMetaTag
 		},
+		"FilenameIsImage": func(filename string) bool {
+			mimeType := mime.TypeByExtension(filepath.Ext(filename))
+			return strings.HasPrefix(mimeType, "image/")
+		},
+		"TabSizeClass": func(ec *editorconfig.Editorconfig, filename string) string {
+			if ec != nil {
+				def := ec.GetDefinitionForFilename(filename)
+				if def.TabWidth > 0 {
+					return fmt.Sprintf("tab-size-%d", def.TabWidth)
+				}
+			}
+			return "tab-size-8"
+		},
 	}}
 }
 
@@ -212,7 +222,6 @@ func RenderCommitMessage(full bool, msg, urlPrefix string, metas map[string]stri
 type Actioner interface {
 	GetOpType() int
 	GetActUserName() string
-	GetActEmail() string
 	GetRepoUserName() string
 	GetRepoName() string
 	GetRepoPath() string

public/config.codekit

@@ -221,6 +221,26 @@
 		"strictMath": 0,
 		"strictUnits": 0
 		},
+	"\/less\/_editor.less": {
+		"allowInsecureImports": 0,
+		"createSourceMap": 0,
+		"disableJavascript": 0,
+		"fileType": 1,
+		"ieCompatibility": 1,
+		"ignore": 1,
+		"ignoreWasSetByUser": 0,
+		"inputAbbreviatedPath": "\/less\/_editor.less",
+		"outputAbbreviatedPath": "\/css\/_editor.css",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"outputStyle": 0,
+		"relativeURLS": 0,
+		"shouldRunAutoprefixer": 0,
+		"shouldRunBless": 0,
+		"strictImports": 0,
+		"strictMath": 0,
+		"strictUnits": 0
+		},
 	"\/less\/_emojify.less": {
 		"allowInsecureImports": 0,
 		"createSourceMap": 0,

public/css/gogs.css

@@ -4,19 +4,8 @@
   display: inline-block;
   background-size: contain;
 }
-.ui.header,
-.ui.menu,
-.ui.button,
-h1,
-h2,
-h3,
-h4,
-h5,
-input {
-  font-family: "Helvetica Neue", "Meiryo Ui", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
-}
 body {
-  font-family: "Helvetica Neue", "Meiryo Ui", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
+  font-family: "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
   background-color: #fff;
   overflow-y: scroll;
 }
@@ -104,6 +93,9 @@ code.wrap {
 .following.bar .avatar > .ui.image {
   margin-right: 0;
 }
+.following.bar .avatar .octicon-triangle-down {
+  margin-top: 6.5px;
+}
 .following.bar .searchbox {
   background-color: #f4f4f4 !important;
 }
@@ -1206,7 +1198,8 @@ footer .ui.language .menu {
 }
 .repository #clone-panel {
   margin-top: -8px;
-  width: 100%;
+  margin-left: 5px;
+  width: 350px;
 }
 .repository #clone-panel input {
   border-radius: 0;
@@ -1232,6 +1225,14 @@ footer .ui.language .menu {
 .repository.file.list .choose.reference .header .icon {
   font-size: 1.4em;
 }
+.repository.file.list #file-buttons {
+  font-weight: normal;
+  margin-top: -3px;
+}
+.repository.file.list #file-buttons .ui.button {
+  padding: 8px 10px;
+  font-weight: normal;
+}
 .repository.file.list #repo-files-table thead th {
   padding-top: 8px;
   padding-bottom: 5px;
@@ -1268,6 +1269,36 @@ footer .ui.language .menu {
   font-size: 1em;
   margin-top: -2px;
 }
+.repository.file.list #file-content .header .file-actions {
+  padding-left: 20px;
+}
+.repository.file.list #file-content .header .file-actions .btn-octicon {
+  display: inline-block;
+  padding: 5px;
+  margin-left: 5px;
+  line-height: 1;
+  color: #767676;
+  vertical-align: middle;
+  background: transparent;
+  border: 0;
+  outline: none;
+}
+.repository.file.list #file-content .header .file-actions .btn-octicon:hover {
+  color: #4078c0;
+}
+.repository.file.list #file-content .header .file-actions .btn-octicon-danger:hover {
+  color: #bd2c00;
+}
+.repository.file.list #file-content .header .file-actions .btn-octicon.disabled {
+  color: #bbb;
+  cursor: default;
+}
+.repository.file.list #file-content .header .file-actions #delete-file-form {
+  display: inline-block;
+}
+.repository.file.list #file-content .view-raw {
+  padding: 5px;
+}
 .repository.file.list #file-content .view-raw * {
   max-width: 100%;
 }
@@ -1315,7 +1346,6 @@ footer .ui.language .menu {
 .repository.file.list #file-content .code-view .lines-code ol li,
 .repository.file.list #file-content .code-view .lines-num .hljs li,
 .repository.file.list #file-content .code-view .lines-code .hljs li {
-  padding-left: 5px;
   display: inline-block;
   width: 100%;
 }
@@ -1327,12 +1357,95 @@ footer .ui.language .menu {
 .repository.file.list #file-content .code-view .lines-code .hljs li.active {
   background: #ffffdd;
 }
+.repository.file.list #file-content .code-view .lines-num pre li:before,
+.repository.file.list #file-content .code-view .lines-code pre li:before,
+.repository.file.list #file-content .code-view .lines-num ol li:before,
+.repository.file.list #file-content .code-view .lines-code ol li:before,
+.repository.file.list #file-content .code-view .lines-num .hljs li:before,
+.repository.file.list #file-content .code-view .lines-code .hljs li:before {
+  content: ' ';
+}
 .repository.file.list .sidebar {
   padding-left: 0;
 }
 .repository.file.list .sidebar .octicon {
   width: 16px;
 }
+.repository.file.editor .treepath {
+  width: 100%;
+}
+.repository.file.editor .treepath input {
+  vertical-align: middle;
+  box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 2px inset;
+  width: inherit;
+  padding: 7px 8px;
+  margin-right: 5px;
+}
+.repository.file.editor .tabular.menu .octicon {
+  margin-right: 5px;
+}
+.repository.file.editor .commit-form-wrapper {
+  padding-left: 64px;
+}
+.repository.file.editor .commit-form-wrapper .commit-avatar {
+  float: left;
+  margin-left: -64px;
+  width: 3em;
+  height: auto;
+}
+.repository.file.editor .commit-form-wrapper .commit-form {
+  position: relative;
+  padding: 15px;
+  margin-bottom: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+}
+.repository.file.editor .commit-form-wrapper .commit-form:before,
+.repository.file.editor .commit-form-wrapper .commit-form:after {
+  right: 100%;
+  top: 20px;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+.repository.file.editor .commit-form-wrapper .commit-form:before {
+  border-right-color: #D4D4D5;
+  border-width: 9px;
+  margin-top: -9px;
+}
+.repository.file.editor .commit-form-wrapper .commit-form:after {
+  border-right-color: #f7f7f7;
+  border-width: 8px;
+  margin-top: -8px;
+}
+.repository.file.editor .commit-form-wrapper .commit-form:after {
+  border-right-color: #fff;
+}
+.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .branch-name {
+  display: inline-block;
+  padding: 3px 6px;
+  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  color: rgba(0, 0, 0, 0.65);
+  background-color: rgba(209, 227, 237, 0.45);
+  border-radius: 3px;
+}
+.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input {
+  position: relative;
+  margin-left: 25px;
+}
+.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input input {
+  width: 240px !important;
+  padding-left: 26px !important;
+}
+.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .octicon-git-branch {
+  position: absolute;
+  top: 9px;
+  left: 10px;
+  color: #b0c4ce;
+}
 .repository.options #interval {
   width: 100px!important;
   min-width: 100px;
@@ -1543,6 +1656,13 @@ footer .ui.language .menu {
   margin: 0;
   vertical-align: middle;
 }
+.repository.view.issue .comment-list .comment .content > .bottom.segment span.ui.image {
+  font-size: 8vw;
+  color: #000000;
+}
+.repository.view.issue .comment-list .comment .content > .bottom.segment span.ui.image:hover {
+  color: #000000;
+}
 .repository.view.issue .comment-list .comment .ui.form .field:first-child {
   clear: none;
 }
@@ -2065,6 +2185,14 @@ footer .ui.language .menu {
   margin-left: 5px;
   margin-top: -3px;
 }
+.repository.settings.webhook .events .column {
+  padding-bottom: 0;
+}
+.repository.settings.webhook .events .help {
+  font-size: 13px;
+  margin-left: 26px;
+  padding-top: 0;
+}
 .user-cards .list {
   padding: 0;
 }
@@ -2150,13 +2278,13 @@ footer .ui.language .menu {
 .page.buttons {
   padding-top: 15px;
 }
-.ui.comments .dropzone {
+.ui.form .dropzone {
   width: 100%;
   margin-bottom: 10px;
   border: 2px dashed #0087F7;
   box-shadow: none!important;
 }
-.ui.comments .dropzone .dz-error-message {
+.ui.form .dropzone .dz-error-message {
   top: 140px;
 }
 .settings .content {
@@ -2312,6 +2440,80 @@ footer .ui.language .menu {
 #delete-repo-modal .ui.message {
   width: 100%!important;
 }
+.tab-size-1 {
+  tab-size: 1 !important;
+  -moz-tab-size: 1 !important;
+}
+.tab-size-2 {
+  tab-size: 2 !important;
+  -moz-tab-size: 2 !important;
+}
+.tab-size-3 {
+  tab-size: 3 !important;
+  -moz-tab-size: 3 !important;
+}
+.tab-size-4 {
+  tab-size: 4 !important;
+  -moz-tab-size: 4 !important;
+}
+.tab-size-5 {
+  tab-size: 5 !important;
+  -moz-tab-size: 5 !important;
+}
+.tab-size-6 {
+  tab-size: 6 !important;
+  -moz-tab-size: 6 !important;
+}
+.tab-size-7 {
+  tab-size: 7 !important;
+  -moz-tab-size: 7 !important;
+}
+.tab-size-8 {
+  tab-size: 8 !important;
+  -moz-tab-size: 8 !important;
+}
+.tab-size-9 {
+  tab-size: 9 !important;
+  -moz-tab-size: 9 !important;
+}
+.tab-size-10 {
+  tab-size: 10 !important;
+  -moz-tab-size: 10 !important;
+}
+.tab-size-11 {
+  tab-size: 11 !important;
+  -moz-tab-size: 11 !important;
+}
+.tab-size-12 {
+  tab-size: 12 !important;
+  -moz-tab-size: 12 !important;
+}
+.tab-size-13 {
+  tab-size: 13 !important;
+  -moz-tab-size: 13 !important;
+}
+.tab-size-14 {
+  tab-size: 14 !important;
+  -moz-tab-size: 14 !important;
+}
+.tab-size-15 {
+  tab-size: 15 !important;
+  -moz-tab-size: 15 !important;
+}
+.tab-size-16 {
+  tab-size: 16 !important;
+  -moz-tab-size: 16 !important;
+}
+.CodeMirror {
+  font: 14px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+.CodeMirror.cm-s-default {
+  border-radius: 3px;
+  padding: 0 !important;
+}
+.CodeMirror .cm-comment {
+  background: inherit !important;
+}
 .organization {
   padding-top: 15px;
   padding-bottom: 80px;
@@ -2451,9 +2653,6 @@ footer .ui.language .menu {
 .user.settings .email.list .item:not(:first-child) .button {
   margin-top: -10px;
 }
-.user.profile .ui.card #profile-avatar {
-  height: 290px;
-}
 .user.profile .ui.card .username {
   display: block;
 }

public/less/_base.less

@@ -1,10 +1,7 @@
 @footer-margin: 40px;
 
-.ui.header, .ui.menu, .ui.button, h1, h2, h3, h4, h5, input {
-	font-family: "Helvetica Neue", "Meiryo Ui", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
-}
 body {
-	font-family: "Helvetica Neue", "Meiryo Ui", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
+	font-family: "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
 	background-color: #fff;
 	overflow-y: scroll;
 }
@@ -92,6 +89,9 @@ pre, code {
 	.avatar > .ui.image {
 		margin-right: 0;
 	}
+	.avatar .octicon-triangle-down {
+		margin-top: 6.5px;
+	}
 	.searchbox {
 		background-color: rgb(244, 244, 244) !important;
 		&:focus {

public/less/_editor.less

@@ -0,0 +1,10 @@
+.CodeMirror {
+	font: 14px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+	&.cm-s-default {
+		  border-radius: 3px;
+		  padding: 0 !important;
+	}
+	.cm-comment {
+		background: inherit !important;
+	}
+}

public/less/_repository.less

@@ -126,7 +126,8 @@
 
 	#clone-panel {
 		margin-top: -8px;
-		width: 100%;
+		margin-left: 5px;
+		width: 350px;
 
 		input {
 			border-radius: 0;
@@ -158,6 +159,14 @@
 				font-size: 1.4em;
 			}
 		}
+		#file-buttons {
+			font-weight: normal;
+			margin-top: -3px;
+			.ui.button {
+				padding: 8px 10px;
+				font-weight: normal;
+			}
+		}
 
 		#repo-files-table {
 			thead {
@@ -204,8 +213,36 @@
 					font-size: 1em;
 					margin-top: -2px;
 				}
+				.file-actions {
+					padding-left: 20px;
+					.btn-octicon {
+					  display: inline-block;
+					  padding: 5px;
+					  margin-left: 5px;
+					  line-height: 1;
+					  color: #767676;
+					  vertical-align: middle;
+					  background: transparent;
+					  border: 0;
+					  outline: none;
+					 }
+					.btn-octicon:hover {
+					  color: #4078c0;
+					}
+					.btn-octicon-danger:hover {
+					  color: #bd2c00;
+					}
+					.btn-octicon.disabled {
+					  color: #bbb;
+					  cursor: default;
+					}
+					#delete-file-form {
+						display: inline-block;
+					}
+				}
 			}
 			.view-raw {
+				padding: 5px;
 				* {
 					max-width: 100%;
 				}
@@ -241,8 +278,6 @@
 				.lines-num,
 				.lines-code {
 					padding: 0;
-
-
 					pre,
 					ol,
 					.hljs {
@@ -250,12 +285,14 @@
 						margin: 0;
 						padding: 0 !important;
 						li {
-							padding-left: 5px;
 							display: inline-block;
 							width: 100%;
 							&.active {
 								background: #ffffdd;
 							}
+							&:before {
+								content: ' ';
+							}
 						}
 					}
 				}
@@ -271,6 +308,72 @@
 		}
 	}
 
+	&.file.editor {
+		.treepath {
+			width: 100%;
+
+			input {
+				vertical-align: middle;
+				box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 2px inset;
+				width: inherit;
+				padding: 7px 8px;
+				margin-right: 5px;
+			}
+		}
+
+		.tabular.menu {
+			.octicon {
+				margin-right: 5px;
+			}
+		}
+
+		.commit-form-wrapper {
+			padding-left: 64px;
+			.commit-avatar {
+				float: left;
+				margin-left: -64px;
+				width: 3em;
+		    height: auto;
+			}
+			.commit-form {
+			  position: relative;
+			  padding: 15px;
+			  margin-bottom: 10px;
+			  border: 1px solid #ddd;
+			  border-radius: 3px;
+			  #avatar-arrow;
+				&:after {
+					border-right-color: #fff;
+				}
+
+				.quick-pull-choice {
+					.branch-name {
+						display: inline-block;
+				    padding: 3px 6px;
+				    font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+				    color: rgba(0,0,0,0.65);
+				    background-color: rgba(209,227,237,0.45);
+				    border-radius: 3px;
+					}
+					.new-branch-name-input {
+				    position: relative;
+				    margin-left: 25px;
+				    input {
+				    	width: 240px !important;
+		    	    padding-left: 26px !important;
+				    }
+					}
+					.octicon-git-branch {
+						position: absolute;
+				    top: 9px;
+				    left: 10px;
+				    color: #b0c4ce;
+					}
+				}
+			}
+		}
+	}
+
 	&.options {
 		#interval {
 			width: 100px!important;
@@ -463,6 +566,13 @@
 							margin: 0;
 							vertical-align: middle;
 						}
+						span.ui.image {
+							font-size: 8vw;
+							color: #000000;
+						}
+						span.ui.image:hover {
+							color: #000000;
+						}
 					}
 				}
 
@@ -1083,6 +1193,19 @@
 				}
 			}
 		}
+
+		&.webhook {
+			.events {
+				.column {
+					padding-bottom: 0;
+				}
+				.help {
+					font-size: 13px;
+					margin-left: 26px;
+					padding-top: 0;
+				}
+			}
+		}
 	}
 }
 // End of .repository
@@ -1181,7 +1304,7 @@
 	padding-top: 15px;
 }
 
-.ui.comments {
+.ui.form {
 	.dropzone {
 		width: 100%;
 		margin-bottom: 10px;
@@ -1353,3 +1476,13 @@
 		width: 100%!important;
 	}
 }
+
+// generate .tab-size-{i} from 1 to 16
+.generate-tab-size(16);
+.generate-tab-size(@n, @i: 1) when (@i =< @n) {
+	.tab-size-@{i} {
+		tab-size: @i !important;
+		-moz-tab-size: @i !important;
+	}
+	.generate-tab-size(@n, (@i + 1));
+}

public/less/_user.less

@@ -23,9 +23,6 @@
 
 	&.profile {
 		.ui.card {
-			#profile-avatar {
-				height: 290px;
-			}
 			.username {
 				display: block;
 			}

public/less/gogs.less

@@ -5,6 +5,7 @@
 @import "_install";
 @import "_form";
 @import "_repository";
+@import "_editor";
 @import "_organization";
 @import "_user";
 @import "_dashboard";

routers/admin/admin.go

@@ -216,7 +216,7 @@ func Config(ctx *context.Context) {
 	}
 
 	ctx.Data["CacheAdapter"] = setting.CacheAdapter
-	ctx.Data["CacheInternal"] = setting.CacheInternal
+	ctx.Data["CacheInterval"] = setting.CacheInterval
 	ctx.Data["CacheConn"] = setting.CacheConn
 
 	ctx.Data["SessionConfig"] = setting.SessionConfig

routers/admin/auths.go

@@ -146,13 +146,18 @@ func NewAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) {
 		return
 	}
 
-	if err := models.CreateSource(&models.LoginSource{
+	if err := models.CreateLoginSource(&models.LoginSource{
 		Type:      models.LoginType(form.Type),
 		Name:      form.Name,
 		IsActived: form.IsActive,
 		Cfg:       config,
 	}); err != nil {
-		ctx.Handle(500, "CreateSource", err)
+		if models.IsErrLoginSourceAlreadyExist(err) {
+			ctx.Data["Err_Name"] = true
+			ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(models.ErrLoginSourceAlreadyExist).Name), AUTH_NEW, form)
+		} else {
+			ctx.Handle(500, "CreateSource", err)
+		}
 		return
 	}
 
@@ -237,10 +242,9 @@ func DeleteAuthSource(ctx *context.Context) {
 	}
 
 	if err = models.DeleteSource(source); err != nil {
-		switch err {
-		case models.ErrAuthenticationUserUsed:
+		if models.IsErrLoginSourceInUse(err) {
 			ctx.Flash.Error(ctx.Tr("admin.auths.still_in_used"))
-		default:
+		} else {
 			ctx.Flash.Error(fmt.Sprintf("DeleteSource: %v", err))
 		}
 		ctx.JSON(200, map[string]interface{}{

routers/api/v1/admin/user.go

@@ -11,7 +11,6 @@ import (
 	"github.com/gogits/gogs/modules/context"
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
 	"github.com/gogits/gogs/routers/api/v1/user"
 )
 
@@ -22,7 +21,7 @@ func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, l
 
 	source, err := models.GetLoginSourceByID(sourceID)
 	if err != nil {
-		if models.IsErrAuthenticationNotExist(err) {
+		if models.IsErrLoginSourceNotExist(err) {
 			ctx.Error(422, "", err)
 		} else {
 			ctx.Error(500, "GetLoginSourceByID", err)
@@ -69,7 +68,7 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) {
 		models.SendRegisterNotifyMail(ctx.Context.Context, u)
 	}
 
-	ctx.JSON(201, convert.ToUser(u))
+	ctx.JSON(201, u.APIFormat())
 }
 
 // https://github.com/gogits/go-gogs-client/wiki/Administration-Users#edit-an-existing-user
@@ -107,6 +106,9 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) {
 	if form.AllowImportLocal != nil {
 		u.AllowImportLocal = *form.AllowImportLocal
 	}
+	if form.MaxRepoCreation != nil {
+		u.MaxRepoCreation = *form.MaxRepoCreation
+	}
 
 	if err := models.UpdateUser(u); err != nil {
 		if models.IsErrEmailAlreadyUsed(err) {
@@ -118,7 +120,7 @@ func EditUser(ctx *context.APIContext, form api.EditUserOption) {
 	}
 	log.Trace("Account profile updated by admin (%s): %s", ctx.User.Name, u.Name)
 
-	ctx.JSON(200, convert.ToUser(u))
+	ctx.JSON(200, u.APIFormat())
 }
 
 // https://github.com/gogits/go-gogs-client/wiki/Administration-Users#delete-a-user

routers/api/v1/api.go

@@ -110,6 +110,15 @@ func reqAdmin() macaron.Handler {
 	}
 }
 
+func reqRepoWriter() macaron.Handler {
+	return func(ctx *context.Context) {
+		if !ctx.Repo.IsWriter() {
+			ctx.Error(403)
+			return
+		}
+	}
+}
+
 func orgAssignment(args ...bool) macaron.Handler {
 	var (
 		assignOrg  bool
@@ -195,6 +204,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, reqToken())
 
 		m.Group("/user", func() {
+			m.Get("", user.GetAuthenticatedUser)
 			m.Combo("/emails").Get(user.ListEmails).
 				Post(bind(api.CreateEmailOption{}), user.AddEmail).
 				Delete(bind(api.CreateEmailOption{}), user.DeleteEmail)
@@ -234,6 +244,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Combo("/:id").Patch(bind(api.EditHookOption{}), repo.EditHook).
 						Delete(repo.DeleteHook)
 				})
+				m.Put("/collaborators/:collaborator", bind(api.AddCollaboratorOption{}), repo.AddCollaborator)
 				m.Get("/raw/*", context.RepoRef(), repo.GetRawFile)
 				m.Get("/archive/*", repo.GetArchive)
 				m.Group("/branches", func() {
@@ -250,6 +261,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Combo("").Get(repo.ListIssues).Post(bind(api.CreateIssueOption{}), repo.CreateIssue)
 					m.Group("/:index", func() {
 						m.Combo("").Get(repo.GetIssue).Patch(bind(api.EditIssueOption{}), repo.EditIssue)
+
+						m.Group("/comments", func() {
+							m.Combo("").Get(repo.ListIssueComments).Post(bind(api.CreateIssueCommentOption{}), repo.CreateIssueComment)
+							m.Combo("/:id").Patch(bind(api.EditIssueCommentOption{}), repo.EditIssueComment)
+						})
+
 						m.Group("/labels", func() {
 							m.Combo("").Get(repo.ListIssueLabels).
 								Post(bind(api.IssueLabelsOption{}), repo.AddIssueLabels).
@@ -266,6 +283,14 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Combo("/:id").Get(repo.GetLabel).Patch(bind(api.EditLabelOption{}), repo.EditLabel).
 						Delete(repo.DeleteLabel)
 				})
+				m.Group("/milestones", func() {
+					m.Combo("").Get(repo.ListMilestones).
+						Post(reqRepoWriter(), bind(api.CreateMilestoneOption{}), repo.CreateMilestone)
+					m.Combo("/:id").Get(repo.GetMilestone).
+						Patch(reqRepoWriter(), bind(api.EditMilestoneOption{}), repo.EditMilestone).
+						Delete(reqRepoWriter(), repo.DeleteMilestone)
+				})
+				m.Get("/editorconfig/:filename", context.RepoRef(), repo.GetEditorconfig)
 			}, repoAssignment())
 		}, reqToken())
 

routers/api/v1/convert/convert.go

@@ -13,24 +13,8 @@ import (
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/log"
-	"github.com/gogits/gogs/modules/setting"
 )
 
-func ToUser(u *models.User) *api.User {
-	if u == nil {
-		return nil
-	}
-
-	return &api.User{
-		ID:        u.ID,
-		UserName:  u.Name,
-		FullName:  u.FullName,
-		Email:     u.Email,
-		AvatarUrl: u.AvatarLink(),
-	}
-}
-
 func ToEmail(email *models.EmailAddress) *api.Email {
 	return &api.Email{
 		Email:    email.Email,
@@ -39,28 +23,6 @@ func ToEmail(email *models.EmailAddress) *api.Email {
 	}
 }
 
-func ToRepository(owner *models.User, repo *models.Repository, permission api.Permission) *api.Repository {
-	cl := repo.CloneLink()
-	return &api.Repository{
-		ID:          repo.ID,
-		Owner:       ToUser(owner),
-		FullName:    owner.Name + "/" + repo.Name,
-		Description: repo.Description,
-		Private:     repo.IsPrivate,
-		Fork:        repo.IsFork,
-		HtmlUrl:     setting.AppUrl + owner.Name + "/" + repo.Name,
-		CloneUrl:    cl.HTTPS,
-		SshUrl:      cl.SSH,
-		OpenIssues:  repo.NumOpenIssues,
-		Stars:       repo.NumStars,
-		Forks:       repo.NumForks,
-		Watchers:    repo.NumWatches,
-		Created:     repo.Created,
-		Updated:     repo.Updated,
-		Permissions: permission,
-	}
-}
-
 func ToBranch(b *models.Branch, c *git.Commit) *api.Branch {
 	return &api.Branch{
 		Name:   b.Name,
@@ -83,12 +45,12 @@ func ToCommit(c *git.Commit) *api.PayloadCommit {
 		ID:      c.ID.String(),
 		Message: c.Message(),
 		URL:     "Not implemented",
-		Author: &api.PayloadAuthor{
+		Author: &api.PayloadUser{
 			Name:     c.Author.Name,
 			Email:    c.Author.Email,
 			UserName: authorUsername,
 		},
-		Committer: &api.PayloadCommitter{
+		Committer: &api.PayloadUser{
 			Name:     c.Committer.Name,
 			Email:    c.Committer.Email,
 			UserName: committerUsername,
@@ -143,72 +105,6 @@ func ToDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey {
 	}
 }
 
-func ToLabel(label *models.Label) *api.Label {
-	return &api.Label{
-		ID:    label.ID,
-		Name:  label.Name,
-		Color: label.Color,
-	}
-}
-
-func ToMilestone(milestone *models.Milestone) *api.Milestone {
-	if milestone == nil {
-		return nil
-	}
-
-	apiMilestone := &api.Milestone{
-		ID:           milestone.ID,
-		State:        milestone.State(),
-		Title:        milestone.Name,
-		Description:  milestone.Content,
-		OpenIssues:   milestone.NumOpenIssues,
-		ClosedIssues: milestone.NumClosedIssues,
-	}
-	if milestone.IsClosed {
-		apiMilestone.Closed = &milestone.ClosedDate
-	}
-	if milestone.Deadline.Year() < 9999 {
-		apiMilestone.Deadline = &milestone.Deadline
-	}
-	return apiMilestone
-}
-
-func ToIssue(issue *models.Issue) *api.Issue {
-	apiLabels := make([]*api.Label, len(issue.Labels))
-	for i := range issue.Labels {
-		apiLabels[i] = ToLabel(issue.Labels[i])
-	}
-
-	apiIssue := &api.Issue{
-		ID:        issue.ID,
-		Index:     issue.Index,
-		State:     issue.State(),
-		Title:     issue.Name,
-		Body:      issue.Content,
-		User:      ToUser(issue.Poster),
-		Labels:    apiLabels,
-		Assignee:  ToUser(issue.Assignee),
-		Milestone: ToMilestone(issue.Milestone),
-		Comments:  issue.NumComments,
-		Created:   issue.Created,
-		Updated:   issue.Updated,
-	}
-	if issue.IsPull {
-		if err := issue.GetPullRequest(); err != nil {
-			log.Error(4, "GetPullRequest", err)
-		} else {
-			apiIssue.PullRequest = &api.PullRequestMeta{
-				HasMerged: issue.PullRequest.HasMerged,
-			}
-			if issue.PullRequest.HasMerged {
-				apiIssue.PullRequest.Merged = &issue.PullRequest.Merged
-			}
-		}
-	}
-
-	return apiIssue
-}
-
 func ToOrganization(org *models.User) *api.Organization {
 	return &api.Organization{
 		ID:          org.ID,

routers/api/v1/repo/collaborators.go

@@ -0,0 +1,38 @@
+// Copyright 2016 The Gogs 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 repo
+
+import (
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/context"
+)
+
+func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {
+	collaborator, err := models.GetUserByName(ctx.Params(":collaborator"))
+	if err != nil {
+		if models.IsErrUserNotExist(err) {
+			ctx.Error(422, "", err)
+		} else {
+			ctx.Error(500, "GetUserByName", err)
+		}
+		return
+	}
+
+	if err := ctx.Repo.Repository.AddCollaborator(collaborator); err != nil {
+		ctx.Error(500, "AddCollaborator", err)
+		return
+	}
+
+	if form.Permission != nil {
+		if err := ctx.Repo.Repository.ChangeCollaborationAccessMode(collaborator.ID, models.ParseAccessMode(*form.Permission)); err != nil {
+			ctx.Error(500, "ChangeCollaborationAccessMode", err)
+			return
+		}
+	}
+
+	ctx.Status(204)
+}

routers/api/v1/repo/file.go

@@ -19,7 +19,7 @@ func GetRawFile(ctx *context.APIContext) {
 		return
 	}
 
-	blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreeName)
+	blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreePath)
 	if err != nil {
 		if git.IsErrNotExist(err) {
 			ctx.Status(404)
@@ -45,3 +45,23 @@ func GetArchive(ctx *context.APIContext) {
 
 	repo.Download(ctx.Context)
 }
+
+func GetEditorconfig(ctx *context.APIContext) {
+	ec, err := ctx.Repo.GetEditorconfig()
+	if err != nil {
+		if git.IsErrNotExist(err) {
+			ctx.Error(404, "GetEditorconfig", err)
+		} else {
+			ctx.Error(500, "GetEditorconfig", err)
+		}
+		return
+	}
+
+	fileName := ctx.Params("filename")
+	def := ec.GetDefinitionForFilename(fileName)
+	if def == nil {
+		ctx.Error(404, "GetDefinitionForFilename", err)
+		return
+	}
+	ctx.JSON(200, def)
+}

routers/api/v1/repo/hook.go

@@ -59,8 +59,9 @@ func CreateHook(ctx *context.APIContext, form api.CreateHookOption) {
 		HookEvent: &models.HookEvent{
 			ChooseEvents: true,
 			HookEvents: models.HookEvents{
-				Create: com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_CREATE)),
-				Push:   com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_PUSH)),
+				Create:      com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_CREATE)),
+				Push:        com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_PUSH)),
+				PullRequest: com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_PULL_REQUEST)),
 			},
 		},
 		IsActive:     form.Active,
@@ -146,6 +147,7 @@ func EditHook(ctx *context.APIContext, form api.EditHookOption) {
 	w.ChooseEvents = true
 	w.Create = com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_CREATE))
 	w.Push = com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_PUSH))
+	w.PullRequest = com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_PULL_REQUEST))
 	if err = w.UpdateEvent(); err != nil {
 		ctx.Error(500, "UpdateEvent", err)
 		return

routers/api/v1/repo/issue.go

@@ -13,7 +13,6 @@ import (
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/context"
 	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
 )
 
 func ListIssues(ctx *context.APIContext) {
@@ -26,9 +25,14 @@ func ListIssues(ctx *context.APIContext) {
 		return
 	}
 
+	// FIXME: use IssueList to improve performance.
 	apiIssues := make([]*api.Issue, len(issues))
 	for i := range issues {
-		apiIssues[i] = convert.ToIssue(issues[i])
+		if err = issues[i].LoadAttributes(); err != nil {
+			ctx.Error(500, "LoadAttributes", err)
+			return
+		}
+		apiIssues[i] = issues[i].APIFormat()
 	}
 
 	ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, setting.UI.IssuePagingNum)
@@ -45,14 +49,13 @@ func GetIssue(ctx *context.APIContext) {
 		}
 		return
 	}
-
-	ctx.JSON(200, convert.ToIssue(issue))
+	ctx.JSON(200, issue.APIFormat())
 }
 
 func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
 	issue := &models.Issue{
 		RepoID:   ctx.Repo.Repository.ID,
-		Name:     form.Title,
+		Title:    form.Title,
 		PosterID: ctx.User.ID,
 		Poster:   ctx.User,
 		Content:  form.Body,
@@ -83,7 +86,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
 
 	if form.Closed {
 		if err := issue.ChangeStatus(ctx.User, ctx.Repo.Repository, true); err != nil {
-			ctx.Error(500, "issue.ChangeStatus", err)
+			ctx.Error(500, "ChangeStatus", err)
 			return
 		}
 	}
@@ -95,7 +98,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
 		ctx.Error(500, "GetIssueByID", err)
 		return
 	}
-	ctx.JSON(201, convert.ToIssue(issue))
+	ctx.JSON(201, issue.APIFormat())
 }
 
 func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
@@ -115,7 +118,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 	}
 
 	if len(form.Title) > 0 {
-		issue.Name = form.Title
+		issue.Title = form.Title
 	}
 	if form.Body != nil {
 		issue.Content = *form.Body
@@ -129,7 +132,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 			assignee, err := models.GetUserByName(*form.Assignee)
 			if err != nil {
 				if models.IsErrUserNotExist(err) {
-					ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", *form.Assignee))
+					ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee))
 				} else {
 					ctx.Error(500, "GetUserByName", err)
 				}
@@ -145,9 +148,9 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 	}
 	if ctx.Repo.IsWriter() && form.Milestone != nil &&
 		issue.MilestoneID != *form.Milestone {
-		oldMid := issue.MilestoneID
+		oldMilestoneID := issue.MilestoneID
 		issue.MilestoneID = *form.Milestone
-		if err = models.ChangeMilestoneAssign(oldMid, issue); err != nil {
+		if err = models.ChangeMilestoneAssign(issue, oldMilestoneID); err != nil {
 			ctx.Error(500, "ChangeMilestoneAssign", err)
 			return
 		}
@@ -157,6 +160,12 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 		ctx.Error(500, "UpdateIssue", err)
 		return
 	}
+	if form.State != nil {
+		if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.STATE_CLOSED == api.StateType(*form.State)); err != nil {
+			ctx.Error(500, "ChangeStatus", err)
+			return
+		}
+	}
 
 	// Refetch from database to assign some automatic values
 	issue, err = models.GetIssueByID(issue.ID)
@@ -164,5 +173,5 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 		ctx.Error(500, "GetIssueByID", err)
 		return
 	}
-	ctx.JSON(201, convert.ToIssue(issue))
+	ctx.JSON(201, issue.APIFormat())
 }