diff --git a/.fswatch.json b/.fswatch.json
deleted file mode 100644
index 7b12022c12..0000000000
--- a/.fswatch.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "paths": ["."],
- "depth": 2,
- "exclude": [],
- "include": ["\\.go$", "\\.ini$"],
- "command": [
- "bash", "-c", "go build && ./gogs web"
- ],
- "env": {
- "POWERED_BY": "github.com/shxsun/fswatch"
- }
-}
diff --git a/.gitignore b/.gitignore
index 57d1493b06..3f7608d7ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ __pycache__
output*
config.codekit
.brackets.json
+docker/fig.yml
+docker/docker/Dockerfile
+docker/docker/init_gogs.sh
diff --git a/.gobuild.yml b/.gobuild.yml
index c3fa262efc..23c7c43cd3 100644
--- a/.gobuild.yml
+++ b/.gobuild.yml
@@ -10,3 +10,12 @@ filesets:
- README_ZH.md
excludes:
- \.git
+settings:
+ build: |
+ if test "$GOOS" = "windows" -a "$GOARCH" = "386"
+ then
+ go install -v
+ else
+ go get -v -tags "sqlite redis memecache" github.com/gogits/gogs
+ go install -v -tags "sqlite redis memecache"
+ fi
diff --git a/.gopmfile b/.gopmfile
index 763aa054a3..3ba514afc8 100644
--- a/.gopmfile
+++ b/.gopmfile
@@ -2,29 +2,29 @@
path = github.com/gogits/gogs
[deps]
-code.google.com/p/mahonia =
-github.com/Unknwon/cae =
-github.com/Unknwon/com =
-github.com/Unknwon/goconfig =
-github.com/Unknwon/i18n =
+github.com/beego/memcache = commit:2aea774416
+github.com/beego/redigo = commit:856744a0d5
+github.com/Unknwon/cae = commit:2e70a1351b
+github.com/Unknwon/com = commit:2cbcbc6916
+github.com/Unknwon/goconfig = commit:0f8d8dc1c0
+github.com/Unknwon/i18n = commit:47baeff8d0
github.com/Unknwon/macaron =
-github.com/codegangsta/cli =
-github.com/go-sql-driver/mysql =
-github.com/go-xorm/core =
-github.com/go-xorm/xorm =
-github.com/gogits/gfm =
-github.com/gogits/git =
-github.com/gogits/oauth2 =
-github.com/juju2013/goldap =
-github.com/lib/pq =
-github.com/macaron-contrib/cache =
+github.com/codegangsta/cli = commit:7381bc4e62
+github.com/go-sql-driver/mysql = commit:8111ee3ec3
+github.com/go-xorm/core = commit:750aae0fa5
+github.com/go-xorm/xorm = commit:2d8b3135b1
+github.com/gogits/gfm = commit:40f747a9c0
+github.com/gogits/oauth2 = commit:99cbec870a
+github.com/lib/pq = commit:b021d0ef20
+github.com/macaron-contrib/cache = commit:204d8e5137
github.com/macaron-contrib/captcha =
github.com/macaron-contrib/csrf =
github.com/macaron-contrib/i18n =
github.com/macaron-contrib/session =
-github.com/macaron-contrib/toolbox =
-github.com/nfnt/resize =
-github.com/saintfish/chardet =
+github.com/macaron-contrib/toolbox = commit:57127bcc89
+github.com/mattn/go-sqlite3 = commit:a80c27ba33
+github.com/nfnt/resize = commit:581d15cb53
+github.com/saintfish/chardet = commit:3af4cd4741
[res]
include = conf|etc|public|scripts|templates
diff --git a/.pkgr.yml b/.pkgr.yml
new file mode 100644
index 0000000000..e670ef8002
--- /dev/null
+++ b/.pkgr.yml
@@ -0,0 +1,15 @@
+targets:
+ ubuntu-14.04:
+ ubuntu-12.04:
+ debian-7:
+build_dependencies:
+ - mercurial
+ - bzr
+dependencies:
+ - git
+before:
+ - mv packager/Procfile .
+ - mv packager/.godir .
+after:
+ - mv bin/main gogs
+after_install: ./packager/debian/postinst
diff --git a/.travis.yml b/.travis.yml
index 2600693b63..eb5732ff60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,4 @@ language: go
go:
- 1.2
- - 1.3
- - tip
\ No newline at end of file
+ - 1.3
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a8b26f1c2..1917ae8854 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,54 @@
# Contributing to Gogs
-> Thanks [drone](https://github.com/drone/drone) because this guidelines sheet is forked from its [CONTRIBUTING.md](https://github.com/drone/drone/blob/master/CONTRIBUTING.md).
+> This guidelines sheet is forked from [CONTRIBUTING.md](https://github.com/drone/drone/blob/master/CONTRIBUTING.md).
-Want to hack on Gogs? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.
+Gogs is not perfect and it has bugs, or incomplete features for rare cases. You're welcome to tell us or contribute some code. This document describles details about how can you contribute to Gogs project.
## Contribution guidelines
-### Pull requests are always welcome
+Depends on the situation, you will:
-**ALL PULL REQUESTS MUST SEND TO `DEV` BRANCH**
+- Find bug, create an issue
+- Need more functionality, make a feature request
+- Want to contribute code, open a pull request
+- Run into issue, need help
+
+### Bug Report
+
+If you find or consider something is a bug, please create a issue on [GitHub](https://github.com/gogits/gogs/issues). To reduce unnecessary time wasting of interacting and waiting with team members, please use following form as template in the first place:
+
+```
+- **Bug Description**:
+- **Gogs Version**:
+- **Git Version**:
+- **System Type**:
+- **Error Log**:
+- **Other information**:
+```
+
+Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
+
+#### Bug Report Example
+
+- **Bug Description**: Crash when create repository with license|
+- **Gogs Version**: `v0.4.9.0901`
+- **Git Version**: `1.9.0`
+- **System Type**: `Ubuntu 12.04`
+- **Error Log**:
+
+```
+2014/09/01 07:21:49 [E] nil pointer
+```
+
+- **Other information**: Use SQLite3 as database
+
+### Feature Request
+
+There is no standard form of making a feature request, just try to describle the feature as clear as possible because team members may not have experience with the functionality you're talking about.
+
+### Pull Request
+
+Pull requests are always welcome, but note that **ALL PULL REQUESTS MUST SEND TO `DEV` BRANCH**.
We are always thrilled to receive pull requests, and do our best to process them as fast as possible. Not sure if that typo is worth a pull request? Do it! We will appreciate it.
@@ -16,16 +56,16 @@ If your pull request is not accepted on the first try, don't be discouraged! If
We're trying very hard to keep Gogs lean and focused. We don't want it to do everything for everybody. This means that we might decide against incorporating a new feature.
+### Ask For Help
+
+Before open any new issue, please check your problem on [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.md) and [FAQs](http://gogs.io/docs/intro/faqs.html) pages.
+
+## Things To Notice
+
+Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) or card on [Trello](https://trello.com/b/uxAoeLUl/gogs-go-git-service) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
+
### Discuss your design on the mailing list
We recommend discussing your plans [on the mailing list](https://groups.google.com/forum/#!forum/gogits) before starting to code - especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give feedback on your design, and maybe point out if someone else is working on the same thing.
-We may close your pull request if not first discussed on the mailing list. We aren't doing this to be jerks. We are doing this to prevent people from spending large amounts of time on changes that may need to be designed or architected in a specific way, or may not align with the vision of the project.
-
-### Create issues...
-
-Any significant improvement should be documented as [a GitHub issue](https://github.com/gogits/gogs/issues) before anybody starts working on it.
-
-### ...but check for existing issues first!
-
-Please take a moment to check that an issue or card on [Trello](https://trello.com/b/uxAoeLUl/gogs-go-git-service) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
\ No newline at end of file
+We may close your pull request if not first discussed on the mailing list. We aren't doing this to be jerks. We are doing this to prevent people from spending large amounts of time on changes that may need to be designed or architected in a specific way, or may not align with the vision of the project.
\ No newline at end of file
diff --git a/README.md b/README.md
index 38e081f464..b7ff264e35 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
-Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://drone.io/github.com/gogits/gogs/latest)
+Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://drone.io/github.com/gogits/gogs/latest)
=====================
Gogs(Go Git Service) is a painless self-hosted Git Service written in Go.
-
+
-##### Current version: 0.4.9 Beta
+##### Current version: 0.5.4 Beta
### NOTICES
-- Due to testing purpose, data of [try.gogits.org](http://try.gogits.org) has been reset in **June 21, 2014** and will reset multiple times after. Please do **NOT** put your important data on the site.
-- Demo site [try.gogits.org](http://try.gogits.org) is running under `dev` branch.
+- Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) has been reset in **June 21, 2014** and will reset multiple times after. Please do **NOT** put your important data on the site.
+- Demo site [try.gogs.io](https://try.gogs.io) is running under `dev` branch.
#### Other language version
@@ -24,7 +24,7 @@ The goal of this project is to make the easiest, fastest and most painless way t
- Please see [Documentation](http://gogs.io/docs/intro/) for project design, known issues, and change log.
- See [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team.
-- Try it before anything? Do it [online](http://try.gogits.org/Unknown/gogs) or go down to **Installation -> Install from binary** section!
+- Try it before anything? Do it [online](https://try.gogs.io/Unknown/gogs) or go down to **Installation -> Install from binary** section!
- Having troubles? Get help from [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.md).
## Features
@@ -35,14 +35,16 @@ The goal of this project is to make the easiest, fastest and most painless way t
- Register/delete/rename account
- Create/manage/delete organization with team management
- Create/migrate/mirror/delete/watch/rename/transfer public/private repository
-- Repository viewer/release/issue tracker/webhooks
+- Repository viewer/release/issue tracker
+- Repository and Organization level webhooks
- Add/remove repository collaborators
- Gravatar and cache support
- Mail service(register, issue)
- Administration panel
+- Slack webhook integration
- Supports MySQL, PostgreSQL and SQLite3
- Social account login(GitHub, Google, QQ, Weibo)
-- Multi-language support(English, Chinese, Germany etc.)
+- Multi-language support(English, Chinese, Germany, French etc.)
## System Requirements
@@ -58,18 +60,17 @@ There are 5 ways to install Gogs:
- [Install from binary](http://gogs.io/docs/installation/install_from_binary.md): **STRONGLY RECOMMENDED**
- [Install from source](http://gogs.io/docs/installation/install_from_source.md)
- [Install from packages](http://gogs.io/docs/installation/install_from_packages.md)
-- [Ship with Docker](https://github.com/gogits/gogs/tree/master/dockerfiles)
+- [Ship with Docker](https://github.com/gogits/gogs/tree/master/docker)
- [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
## Acknowledgments
-- Router and middleware mechanism of [martini](http://martini.codegangsta.io/).
+- Router and middleware mechanism of [Macaron](https://github.com/Unknwon/macaron).
- Mail Service, modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
- Usage and modification from [beego](http://beego.me) modules.
- Thanks [lavachen](http://www.lavachen.cn/) and [Rocker](http://weibo.com/rocker1989) for designing Logo.
- Thanks [gobuild.io](http://gobuild.io) for providing binary compile and download service.
-- Great thanks to [Docker China](http://www.dockboard.org/) for providing [dockerfiles](https://github.com/gogits/gogs/tree/master/dockerfiles).
## Contributors
diff --git a/README_ZH.md b/README_ZH.md
index b830d41643..d704053f22 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -3,9 +3,9 @@ Gogs - Go Git Service [ 是一个基于 Go 语言的自助 Git 服务。
-
+
-##### 当前版本：0.4.9 Beta
+##### 当前版本：0.5.4 Beta
## 开发目的
@@ -15,7 +15,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
- 有关项目设计、已知问题和变更日志，请通过 [使用手册](http://gogs.io/docs/intro/) 查看。
- 您可以到 [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) 跟随开发团队的脚步。
-- 想要先睹为快？通过 [在线体验](http://try.gogits.org/Unknown/gogs) 或查看 **安装部署 -> 二进制安装** 小节。
+- 想要先睹为快？通过 [在线体验](https://try.gogs.io/Unknown/gogs) 或查看 **安装部署 -> 二进制安装** 小节。
- 使用过程中遇到问题？尝试从 [故障排查](http://gogs.io/docs/intro/troubleshooting.md) 页面获取帮助。
## 功能特性
@@ -26,14 +26,16 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
- 注册/删除/重命名 用户
- 创建/管理/删除 组织以及团队管理功能
- 创建/迁移/镜像/删除/关注/重命名/转移 公开/私有 仓库
-- 仓库 浏览/发布/工单管理/Web 钩子
+- 仓库 浏览/发布/工单管理
+- 仓库和组织级别 Web 钩子
- 添加/删除 仓库协作者
- Gravatar 以及缓存支持
- 邮件服务（注册、Issue）
- 管理员面板
+- Slack Web 钩子集成
- 支持 MySQL、PostgreSQL 以及 SQLite3 数据库
- 社交帐号登录（GitHub、Google、QQ、微博）
-- 多语言支持（英文、简体中文、德语等等）
+- 多语言支持（英文、简体中文、德语、法语等等）
## 系统要求
@@ -49,18 +51,17 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
- [二进制安装](http://gogs.io/docs/installation/install_from_binary.md): **强烈推荐**
- [源码安装](http://gogs.io/docs/installation/install_from_source.md)
- [包管理安装](http://gogs.io/docs/installation/install_from_packages.md)
-- [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/dockerfiles)
+- [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/docker)
- [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
## 特别鸣谢
+- [Macaron](https://github.com/Unknwon/macaron) 的路由与中间件机制。
+- [beego](http://beego.me) 模块的使用与修改。
- 基于 [WeTalk](https://github.com/beego/wetalk) 修改的邮件服务和模块设计。
- 基于 [GoBlog](https://github.com/fuxiaohei/goblog) 修改的系统监视状态。
-- [beego](http://beego.me) 模块的使用与修改。
-- [martini](http://martini.codegangsta.io/) 的路由与中间件机制。
- 感谢 [gobuild.io](http://gobuild.io) 提供二进制编译与下载服务。
- 感谢 [lavachen](http://www.lavachen.cn/) 和 [Rocker](http://weibo.com/rocker1989) 设计的 Logo。
-- 感谢 [Docker 中文社区](http://www.dockboard.org/) 提供的 [dockerfiles](https://github.com/gogits/gogs/tree/master/dockerfiles)。
## 贡献成员
diff --git a/cmd/cert.go b/cmd/cert.go
new file mode 100644
index 0000000000..b693b7d94e
--- /dev/null
+++ b/cmd/cert.go
@@ -0,0 +1,158 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Copyright 2014 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 (
+ "crypto/ecdsa"
+ "crypto/elliptic"
+ "crypto/rand"
+ "crypto/rsa"
+ "crypto/x509"
+ "crypto/x509/pkix"
+ "encoding/pem"
+ "log"
+ "math/big"
+ "net"
+ "os"
+ "strings"
+ "time"
+
+ "github.com/codegangsta/cli"
+)
+
+var CmdCert = cli.Command{
+ Name: "cert",
+ Usage: "Generate self-signed certificate",
+ Description: `Generate a self-signed X.509 certificate for a TLS server.
+Outputs to 'cert.pem' and 'key.pem' and will overwrite existing files.`,
+ Action: runCert,
+ Flags: []cli.Flag{
+ cli.StringFlag{"host", "", "Comma-separated hostnames and IPs to generate a certificate for", ""},
+ cli.StringFlag{"ecdsa-curve", "", "ECDSA curve to use to generate a key. Valid values are P224, P256, P384, P521", ""},
+ cli.IntFlag{"rsa-bits", 2048, "Size of RSA key to generate. Ignored if --ecdsa-curve is set", ""},
+ cli.StringFlag{"start-date", "", "Creation date formatted as Jan 1 15:04:05 2011", ""},
+ cli.DurationFlag{"duration", 365 * 24 * time.Hour, "Duration that certificate is valid for", ""},
+ cli.BoolFlag{"ca", "whether this cert should be its own Certificate Authority", ""},
+ },
+}
+
+func publicKey(priv interface{}) interface{} {
+ switch k := priv.(type) {
+ case *rsa.PrivateKey:
+ return &k.PublicKey
+ case *ecdsa.PrivateKey:
+ return &k.PublicKey
+ default:
+ return nil
+ }
+}
+
+func pemBlockForKey(priv interface{}) *pem.Block {
+ switch k := priv.(type) {
+ case *rsa.PrivateKey:
+ return &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(k)}
+ case *ecdsa.PrivateKey:
+ b, err := x509.MarshalECPrivateKey(k)
+ if err != nil {
+ log.Fatal("unable to marshal ECDSA private key: %v", err)
+ }
+ return &pem.Block{Type: "EC PRIVATE KEY", Bytes: b}
+ default:
+ return nil
+ }
+}
+
+func runCert(ctx *cli.Context) {
+ if len(ctx.String("host")) == 0 {
+ log.Fatal("Missing required --host parameter")
+ }
+
+ var priv interface{}
+ var err error
+ switch ctx.String("ecdsa-curve") {
+ case "":
+ priv, err = rsa.GenerateKey(rand.Reader, ctx.Int("rsa-bits"))
+ case "P224":
+ priv, err = ecdsa.GenerateKey(elliptic.P224(), rand.Reader)
+ case "P256":
+ priv, err = ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+ case "P384":
+ priv, err = ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
+ case "P521":
+ priv, err = ecdsa.GenerateKey(elliptic.P521(), rand.Reader)
+ default:
+ log.Fatalf("Unrecognized elliptic curve: %q", ctx.String("ecdsa-curve"))
+ }
+ if err != nil {
+ log.Fatalf("Failed to generate private key: %s", err)
+ }
+
+ var notBefore time.Time
+ if len(ctx.String("start-date")) == 0 {
+ notBefore = time.Now()
+ } else {
+ notBefore, err = time.Parse("Jan 2 15:04:05 2006", ctx.String("start-date"))
+ if err != nil {
+ log.Fatalf("Failed to parse creation date: %s", err)
+ }
+ }
+
+ notAfter := notBefore.Add(ctx.Duration("duration"))
+
+ serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
+ serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
+ if err != nil {
+ log.Fatalf("Failed to generate serial number: %s", err)
+ }
+
+ template := x509.Certificate{
+ SerialNumber: serialNumber,
+ Subject: pkix.Name{
+ Organization: []string{"Acme Co"},
+ },
+ NotBefore: notBefore,
+ NotAfter: notAfter,
+
+ KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+ ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+ BasicConstraintsValid: true,
+ }
+
+ hosts := strings.Split(ctx.String("host"), ",")
+ for _, h := range hosts {
+ if ip := net.ParseIP(h); ip != nil {
+ template.IPAddresses = append(template.IPAddresses, ip)
+ } else {
+ template.DNSNames = append(template.DNSNames, h)
+ }
+ }
+
+ if ctx.Bool("ca") {
+ template.IsCA = true
+ template.KeyUsage |= x509.KeyUsageCertSign
+ }
+
+ derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(priv), priv)
+ if err != nil {
+ log.Fatalf("Failed to create certificate: %s", err)
+ }
+
+ certOut, err := os.Create("cert.pem")
+ if err != nil {
+ log.Fatalf("Failed to open cert.pem for writing: %s", err)
+ }
+ pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
+ certOut.Close()
+ log.Println("Written cert.pem")
+
+ keyOut, err := os.OpenFile("key.pem", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+ if err != nil {
+ log.Fatal("failed to open key.pem for writing: %v", err)
+ }
+ pem.Encode(keyOut, pemBlockForKey(priv))
+ keyOut.Close()
+ log.Println("Written key.pem")
+}
diff --git a/cmd/dump.go b/cmd/dump.go
index 2a54db1a87..414912243c 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -24,16 +24,18 @@ var CmdDump = cli.Command{
Description: `Dump compresses all related files and database into zip file.
It can be used for backup and capture Gogs server image to send to maintainer`,
Action: runDump,
- Flags: []cli.Flag{},
+ Flags: []cli.Flag{
+ cli.BoolFlag{"verbose, v", "show process details", ""},
+ },
}
-func runDump(*cli.Context) {
+func runDump(ctx *cli.Context) {
setting.NewConfigContext()
models.LoadModelsConfig()
models.SetEngine()
log.Printf("Dumping local repositories...%s", setting.RepoRootPath)
- zip.Verbose = false
+ zip.Verbose = ctx.Bool("verbose")
defer os.Remove("gogs-repo.zip")
if err := zip.PackTo(setting.RepoRootPath, "gogs-repo.zip", true); err != nil {
log.Fatalf("Fail to dump local repositories: %v", err)
diff --git a/cmd/serve.go b/cmd/serve.go
index b1dffc92e7..c18bf3ad4b 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -171,7 +171,13 @@ func runServ(k *cli.Context) {
uuid := uuid.NewV4().String()
os.Setenv("uuid", uuid)
- gitcmd := exec.Command(verb, repoPath)
+ var gitcmd *exec.Cmd
+ verbs := strings.Split(verb, " ")
+ if len(verbs) == 2 {
+ gitcmd = exec.Command(verbs[0], verbs[1], repoPath)
+ } else {
+ gitcmd = exec.Command(verb, repoPath)
+ }
gitcmd.Dir = setting.RepoRootPath
gitcmd.Stdout = os.Stdout
gitcmd.Stdin = os.Stdin
diff --git a/cmd/web.go b/cmd/web.go
index e0ef3a76a3..72a58bc995 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -11,6 +11,7 @@ import (
"net/http"
"os"
"path"
+ "strings"
"github.com/Unknwon/macaron"
"github.com/codegangsta/cli"
@@ -26,6 +27,7 @@ import (
"github.com/gogits/gogs/modules/auth/apiv1"
"github.com/gogits/gogs/modules/avatar"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/git"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/middleware/binding"
@@ -50,6 +52,7 @@ and it takes care of all the other things for you`,
// checkVersion checks if binary matches the version of templates files.
func checkVersion() {
+ // Templates.
data, err := ioutil.ReadFile(path.Join(setting.StaticRootPath, "templates/.VERSION"))
if err != nil {
log.Fatal(4, "Fail to read 'templates/.VERSION': %v", err)
@@ -57,6 +60,12 @@ func checkVersion() {
if string(data) != setting.AppVer {
log.Fatal(4, "Binary and template file version does not match, did you forget to recompile?")
}
+
+ // Macaron.
+ macaronVer := git.MustParseVersion(strings.Join(strings.Split(macaron.Version(), ".")[:3], "."))
+ if macaronVer.LessThan(git.MustParseVersion("0.1.8")) {
+ log.Fatal(4, "Macaron version does not match, did you forget to update?(github.com/Unknwon/macaron)")
+ }
}
// newMacaron initializes Macaron instance.
@@ -64,20 +73,22 @@ func newMacaron() *macaron.Macaron {
m := macaron.New()
m.Use(macaron.Logger())
m.Use(macaron.Recovery())
- m.Use(macaron.Static("public",
+ m.Use(macaron.Static(
+ path.Join(setting.StaticRootPath, "public"),
macaron.StaticOptions{
SkipLogging: !setting.DisableRouterLog,
},
))
- if setting.EnableGzip {
- m.Use(macaron.Gzip())
- }
+ // if setting.EnableGzip {
+ // m.Use(macaron.Gzip())
+ // }
m.Use(macaron.Renderer(macaron.RenderOptions{
Directory: path.Join(setting.StaticRootPath, "templates"),
Funcs: []template.FuncMap{base.TemplateFuncs},
IndentJSON: macaron.Env != macaron.PROD,
}))
m.Use(i18n.I18n(i18n.Options{
+ SubURL: setting.AppSubUrl,
Langs: setting.Langs,
Names: setting.Names,
Redirect: true,
@@ -87,14 +98,18 @@ func newMacaron() *macaron.Macaron {
Interval: setting.CacheInternal,
Conn: setting.CacheConn,
}))
- m.Use(captcha.Captchaer())
+ m.Use(captcha.Captchaer(captcha.Options{
+ SubURL: setting.AppSubUrl,
+ }))
m.Use(session.Sessioner(session.Options{
Provider: setting.SessionProvider,
Config: *setting.SessionConfig,
}))
m.Use(csrf.Generate(csrf.Options{
- Secret: setting.SecretKey,
- SetCookie: true,
+ Secret: setting.SecretKey,
+ SetCookie: true,
+ Header: "X-Csrf-Token",
+ CookiePath: setting.AppSubUrl,
}))
m.Use(toolbox.Toolboxer(m, toolbox.Options{
HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
@@ -123,6 +138,7 @@ func runWeb(*cli.Context) {
// Routers.
m.Get("/", ignSignIn, routers.Home)
+ m.Get("/explore", ignSignIn, routers.Explore)
m.Get("/install", bindIgnErr(auth.InstallForm{}), routers.Install)
m.Post("/install", bindIgnErr(auth.InstallForm{}), routers.InstallPost)
m.Group("", func(r *macaron.Router) {
@@ -183,7 +199,8 @@ func runWeb(*cli.Context) {
r.Get("/logout", user.SignOut)
})
- m.Get("/user/:username", ignSignIn, user.Profile) // TODO: Legacy
+ // FIXME: Legacy
+ m.Get("/user/:username", ignSignIn, user.Profile)
// Gravatar service.
avt := avatar.CacheServer("public/img/avatar/", "public/img/avatar_default.jpg")
@@ -259,6 +276,13 @@ func runWeb(*cli.Context) {
m.Group("/settings", func(r *macaron.Router) {
r.Get("", org.Settings)
r.Post("", bindIgnErr(auth.UpdateOrgSettingForm{}), org.SettingsPost)
+ r.Get("/hooks", org.SettingsHooks)
+ r.Get("/hooks/new", repo.WebHooksNew)
+ r.Post("/hooks/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
+ r.Post("/hooks/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
+ r.Get("/hooks/:id", repo.WebHooksEdit)
+ r.Post("/hooks/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
+ r.Post("/hooks/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
r.Route("/delete", "GET,POST", org.SettingsDelete)
})
@@ -284,9 +308,11 @@ func runWeb(*cli.Context) {
r.Route("/collaboration", "GET,POST", repo.SettingsCollaboration)
r.Get("/hooks", repo.Webhooks)
r.Get("/hooks/new", repo.WebHooksNew)
- r.Post("/hooks/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
+ r.Post("/hooks/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
+ r.Post("/hooks/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
r.Get("/hooks/:id", repo.WebHooksEdit)
- r.Post("/hooks/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
+ r.Post("/hooks/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
+ r.Post("/hooks/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
})
}, reqSignIn, middleware.RepoAssignment(true), reqTrueOwner)
@@ -327,6 +353,8 @@ func runWeb(*cli.Context) {
r.Get("/issues/:index", repo.ViewIssue)
r.Get("/pulls", repo.Pulls)
r.Get("/branches", repo.Branches)
+ r.Get("/archive/*", repo.Download)
+ r.Get("/issues2/", repo.Issues2)
}, ignSignIn, middleware.RepoAssignment(true))
m.Group("/:username/:reponame", func(r *macaron.Router) {
@@ -339,22 +367,29 @@ func runWeb(*cli.Context) {
r.Get("/commit/:branchname", repo.Diff)
r.Get("/commit/:branchname/*", repo.Diff)
r.Get("/releases", repo.Releases)
- r.Get("/archive/*.*", repo.Download)
+ r.Get("/compare/:before([a-z0-9]+)...:after([a-z0-9]+)", repo.CompareDiff)
}, ignSignIn, middleware.RepoAssignment(true, true))
m.Group("/:username", func(r *macaron.Router) {
- r.Get("/:reponame", middleware.RepoAssignment(true, true, true), repo.Home)
- m.Group("/:reponame", func(r *macaron.Router) {
- r.Any("/*", repo.Http)
- })
- }, ignSignInAndCsrf)
+ r.Get("/:reponame", ignSignIn, middleware.RepoAssignment(true, true, true), repo.Home)
+ r.Any("/:reponame/*", ignSignInAndCsrf, repo.Http)
+ })
+
+ // robots.txt
+ m.Get("/robots.txt", func(ctx *middleware.Context) {
+ if setting.HasRobotsTxt {
+ ctx.ServeFile(path.Join(setting.CustomPath, "robots.txt"))
+ } else {
+ ctx.Error(404)
+ }
+ })
// Not found handler.
m.NotFound(routers.NotFound)
var err error
listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
- log.Info("Listen: %v://%s", setting.Protocol, listenAddr)
+ log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
switch setting.Protocol {
case setting.HTTP:
err = http.ListenAndServe(listenAddr, m)
diff --git a/conf/app.ini b/conf/app.ini
index d2d121e06c..224f45dd62 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -1,6 +1,5 @@
; App name that shows on every page title
APP_NAME = Gogs: Go Git Service
-APP_LOGO = img/favicon.png
; Change it if you run locally
RUN_USER = git
; Either "dev", "prod" or "test", default is "dev"
@@ -22,14 +21,14 @@ OFFLINE_MODE = false
DISABLE_ROUTER_LOG = false
; Generate steps:
; $ cd path/to/gogs/custom/https
-; $ go run $GOROOT/src/pkg/crypto/tls/generate_cert.go -ca=true -duration=8760h0m0s -host=myhost.example.com
+; $ ./gogs cert -ca=true -duration=8760h0m0s -host=myhost.example.com
CERT_FILE = custom/https/cert.pem
KEY_FILE = custom/https/key.pem
; Upper level of template and static file path
; default is the path where Gogs is executed
STATIC_ROOT_PATH =
; Application level GZIP support
-ENABLE_GZIP = false
+#ENABLE_GZIP = false
[database]
; Either "mysql", "postgres" or "sqlite3", it's your choice
@@ -253,6 +252,9 @@ DRIVER =
; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8
CONN =
+[git]
+MAX_GITDIFF_LINES = 10000
+
[i18n]
-LANGS = en-US,zh-CN,de-DE,nl-NL
-NAMES = English,简体中文,Deutsch,Nederlands
+LANGS = en-US,zh-CN,de-DE,fr-CA,nl-NL
+NAMES = English,简体中文,Deutsch,Français,Nederlands
diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index b40c7b7894..cc8b0b5d52 100644
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -1,4 +1,4 @@
-app_desc = Ein schmerzloses selbst gehostetes Git-Service welches in Go geschrieben wurde
+app_desc = Ein einfacher, selbst gehosteter Git-Service, geschrieben in Go.
home = Home
dashboard = Dashboard
@@ -12,23 +12,23 @@ register = Registrieren
website = Webseite
version = Version
page = Seite
-template = Template
+template = Vorlage
language = Sprache
username = Benutzername
-email = E-mail
-password = Kennwort
-re_type = neu tippen
+email = E-Mail
+password = Passwort
+re_type = wiederholen
captcha = Captcha
-repository = Repositorie
+repository = Repository
organization = Organisation
mirror = Spiegel
new_repo = Neues Repository
new_migrate = Neue Migration
new_org = Neue Organisation
manage_org = Organisationen verwalten
-admin_panel = Admin Panel
+admin_panel = Admin-Panel
account_settings = Kontoeinstellungen
settings = Einstellungen
@@ -38,214 +38,276 @@ issues = Issues
cancel = Abbrechen
+[install]
+install = Installation
+title = Installation für erstmaligen Start
+requite_db_desc = Gogs erfordert MySQL, PostgreSQL oder SQLite 3, aber SQLite3 ist in der offiziellen binären Version akiviert.
+db_type = Datenbanktyp
+host = Host
+user = Benutzer
+password = Passwort
+db_name = Datenbankname
+db_helper = Bitte verwenden InnoDB-Engine mit utf8_general_ci Zeichensatz für MySQL.
+ssl_mode = SSL-Modus
+path = Pfad
+sqlite_helper = Der Dateipfad des SQLite3 Datenbank.
+general_title = Allgemeine Einstellungen von Gogs
+repo_path = Repository Root-Verzeichnispfad
+repo_path_helper = Alle Git-Repositorys werden in diesem Verzeichnis gespeichert.
+run_user = Ausführender Benutzer
+run_user_helper = Der Benutzer muss die Zugriffsberechtigung für das Repository Root-Verzeichnis haben und der ausführende Benutzer von Gogs sein.
+domain = Domain
+domain_helper = Dies hat Auswirkung auf die SSH clone URLs.
+app_url = Anwendungs-URL
+app_url_helper = Dies hat Auswirkung auf die HTTP/HTTPS clone URLs und für die E-Mails.
+email_title = E-Mail-Service-Einstellungen(Optional)
+smtp_host = SMTP Host
+mailer_user = Sender E-mail
+mailer_password = Sender Passwort
+notify_title = Benachrichtigungseinstellungen(Optional)
+register_confirm = Registrierungsbestätigung aktvieren
+mail_notify = E-Mail-Benachrichtgung aktivieren
+admin_title = Konto-Einstellungen für den Administrator
+admin_name = Benutzername
+admin_password = Passwort
+confirm_password = Passwort bestätigen
+admin_email = E-Mail
+install_gogs = Gogs installieren
+test_git_failed = Fehler beim Test des 'git' Kommandos: %v
+sqlite3_not_available = Deine Version unterstüzt nicht SQLite3, bitte downloade dir die offiziele binäre Version von http://gogs.io/docs/installation/install_from_binary.html, NICHT die gobuild Version.
+invalid_db_setting = Datenbank-Einstellungen sind nicht korrekt: %v
+invalid_repo_path = Repository Root-Verzeichnis ist ungültig: %v
+run_user_not_match = Der ausführende Benutzer ist nicht der aktuelle Benutzer: %s -> %s
+save_config_failed = Versuche die Konfiguration zu speichern ist fehlgeschlagen: %v
+invalid_admin_setting = Admin-Konto Einstellungen sind ungültig: %v
+install_success = Herzlich Willkommen! Wir sind froh, dass du dich für Gogs entschieden hast. Hab viel Vergnügen damit.
+
[home]
-uname_holder = Benutzername oder E-mail
-password_holder = Kennwort
+uname_holder = Benutzername oder E-Mail
+password_holder = Passwort
switch_dashboard_context = Switch Dashboard Context
-my_repos = Meine Repositories
-collaborative_repos = Collaborative Repositories
+my_repos = Meine Repositorys
+collaborative_repos = Gemeinschaftliche Repositorys
my_orgs = Meine Organisationen
my_mirrors = Meine Spiegel
+[explore]
+repos = Repositories
+
[auth]
create_new_account = Neues Konto erstellen
-register_hepler_msg = Sie haben bereits ein Konto? Jetzt anmelden!
-social_register_hepler_msg = Sie haben bereits ein Konto? Verknüpfe es jetzt!
-disable_register_prompt = Es tut uns leid, die Registrierung wurde deaktiviert. Bitte wende Sie sich an den Administrator.
-disable_register_mail = Es tut uns leid, die Registrierung E-Mail Bestätigung wurde deaktiviert.
-remember_me = Erinnere mich
-forgot_password= Kennwort vergessen
-forget_password = Kennwort vergessen?
-sign_up_now = Benötigen Sie ein Konto? Registrieren Sie sich jetzt.
-confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to %s, please check your inbox within the next %d hours to complete your registration.
-sign_in_email = Melden Sie sich mit Ihrer E-Mailadresse an
-active_your_account = Aktivieren Sie Ihr Konto
-resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.
-has_unconfirmed_mail = Hi %s, you have an unconfirmed email address(%s). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
-resend_mail = Klicken Sie hier, um Ihre Aktivierungs-E-Mail erneut senden
-email_not_associate = Diese E-Mail-Adresse ist mit keinen Konto verknüpft.
-send_reset_mail = Klicken Sie hier, um sich das E-Mail zum Kennwort zurücksetzen erneut zu senden
-reset_password = Ihr Kennwort zurücksetzen
-invalid_code = Es tut uns leid, Ihre Bestätigungscode abgelaufen ist oder nicht gültig.
-reset_password_helper = Klicken Sie hier, um Ihr Kennwort zurückzusetzen
-password_too_short = Passwortlänge kann nicht weniger als 6 sein.
+register_hepler_msg = Du hast schon ein Konto? Jetzt anmelden!
+social_register_hepler_msg = Du hast schon ein soziales Konto? Jetzt verknüpfen!
+disable_register_prompt = Es tut uns leid, die Registrierung wurde deaktiviert. Bitte wende dich an den Administrator.
+disable_register_mail = Es tut uns leid, die Bestätigung der Registrierungs-E-Mail wurde deaktiviert.
+remember_me = angemeldet bleiben
+forgot_password= Passwort vergessen
+forget_password = Passwort vergessen?
+sign_up_now = Du willst ein Konto? Jetzt registrieren!
+confirmation_mail_sent_prompt = Eine neu Bestätigungs-E-Mail wurde an %s gesendet. Kontrolliere dein Postfach innerhalb der nächsten %d Stunden um die Registrierung abzuschließen.
+sign_in_email = Melden dich mit deiner E-Mail-Adresse an
+active_your_account = Aktivieren dein Konto
+resent_limit_prompt = Es tut uns leid, du sendest zu häufig Aktivierungs-E-Mails. Bitte warte 3 Minuten.
+has_unconfirmed_mail = Hallo %s, du hast eine unbestätigte E-Mail-Adresse (%s). Falls du noch keine Bestätigungs-E-Mail erhalten hast oder eine neue senden musst, klicke auf den unteren Button.
+resend_mail = Hier klicken, um deine Aktivierungs-E-Mail erneut zu versenden
+email_not_associate = Diese E-Mail-Adresse ist mit keinem Konto verknüpft.
+send_reset_mail = Hier klicken, um die E-Mail zum Passwort-zurücksetzen erneut zu versenden
+reset_password = Passwort zurücksetzen
+invalid_code = Es tut uns leid, der Bestätigungscode ist abgelaufen oder ungültig.
+reset_password_helper = Hier klicken, um das Passwort zurückzusetzen
+password_too_short = Das Passwort muss mindenstens 6 Zeichen lang sein
[form]
UserName = Benutzername
-RepoName = Repository Name
+RepoName = Repository-Name
Email = E-Mail-Adresse
-Password = Kennwort
-Retype = Kennwort erneut eingeben
-SSHTitle = SSH Schlüsselname
-HttpsUrl = HTTPS URL
-PayloadUrl = Payload URL
+Password = Passwort
+Retype = Passwort erneut eingeben
+SSHTitle = SSH-Schlüsselname
+HttpsUrl = HTTPS-URL
+PayloadUrl = Payload-URL
TeamName = Teamname
AuthName = Authentifizierungsname
+AdminEmail = Admin E-mail
require_error = ` darf nicht leer sein.`
-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.`
+alpha_dash_error = ` kann ausschließlich alphanumerische Zeichen und "-_" enthalten.`
+alpha_dash_dot_error = ` kann ausschließlich alphanumerische Zeichen und ".-_" enthalten.`
min_size_error = ` muss mindestens %s Zeichen enthalten.`
max_size_error = ` darf höchstens %s Zeichen enthalten.`
email_error = ` ist keine gültige E-Mail-Adresse.`
url_error = ` ist keine gültige URL.`
unknown_error = Unbekannter Fehler:
captcha_incorrect = Captcha stimmt nicht überein.
-password_not_match = Die Kennwörter stimmen nicht überein.
+password_not_match = Die Passwörter stimmen nicht überein.
username_been_taken = Benutzername ist bereits vergeben.
-repo_name_been_taken = Repository Name ist bereits vergeben.
+repo_name_been_taken = Repository-Name ist bereits vergeben.
org_name_been_taken = Organisationsname ist bereits vergeben.
team_name_been_taken = Teamname ist bereits vergeben.
-email_been_used = E-Mail-Adresse ist bereits vergeben.
-ssh_key_been_used = Public-Key Name wird bereits verwendet.
-illegal_username = Ihr Benutzername enthält ungültige Zeichen.
-illegal_repo_name = Repository Name enthält ungültige Zeichen.
+email_been_used = E-Mail-Adresse wird bereits verwendet.
+ssh_key_been_used = SSH-Schlüsselname wird bereits verwendet.
+illegal_username = Benutzername enthält ungültige Zeichen.
+illegal_repo_name = Repository-Name enthält ungültige Zeichen.
illegal_org_name = Organisationsname enthält ungültige Zeichen.
illegal_team_name = Teamname enthält ungültige Zeichen.
-username_password_incorrect = Benutzername oder Kennwort ist nicht korrekt.
-enterred_invalid_repo_name = Bitte stellen Sie sicher, dass der eingegeben Repository Name richtig ist.
-enterred_invalid_owner_name = Bitte stellen Sie sicher, dass der eingegeben Eigentümername richtig ist.
-enterred_invalid_password = Bitte stellen Sie sicher, dass das eingegebene Passwort richtig ist.
+username_password_incorrect = Benutzername oder Passwort ist nicht korrekt.
+enterred_invalid_repo_name = Bitte stelle sicher, dass der eingegeben Repository-Name richtig ist.
+enterred_invalid_owner_name = Bitte stelle sicher, dass der eingegeben Besitzername richtig ist.
+enterred_invalid_password = Bitte stelle sicher, dass das eingegebene Passwort richtig ist.
user_not_exist = Angegebener Benutzer existiert nicht.
-last_org_owner = The user to remove is the last member in owner team. There must be another owner.
+last_org_owner = Der zu entfernende Benutzer ist der letzte Teambesitzer. Es muss einen anderen Besitzer geben.
invalid_ssh_key = Leider sind wir nicht in der Lage, Ihren SSH-Schlüssel zu überprüfen: %s
auth_failed = Authentifizierung fehlgeschlagen: %v
-still_own_repo = Your account still have ownership of repository, you have to delete or transfer them first.
-org_still_own_repo = This organization still have ownership of repository, you have to delete or transfer them first.
+still_own_repo = Dein Konto besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden.
+org_still_own_repo = Diese Organisation besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden.
-still_own_user = This authentication still has used by some users, you should move them and then delete again.
+still_own_user = Diese Authentifizierung wird noch von einigen Benutzern genutzt. Entferne diese zuvor und lösche erneut.
[settings]
profile = Profil
-password = Kennwort
+password = Passwort
ssh_keys = SSH-Schlüssel
-social = Social Konten
+social = Soziale Konten
orgs = Organisationen
-delete = Delete Accoount
+delete = Konto löschen
+uid = Uid
public_profile = Öffentliches Profil
-profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.
+profile_desc = Deine E-Mail-Adresse ist öffentlich und dient dazu, dir Benachrichtigungen bezüglich deines Kontos und deiner Repositorys zu schicken.
full_name = Vollständiger Name
-website = Website
+website = Webseite
location = Standort
update_profile = Profil aktualisieren
-update_profile_success = Your profile has been successfully updated.
+update_profile_success = Profil aktualisiert
-change_password = Kennwort ändern
-old_password = Aktuelles Kennwort
-new_password = Neues Kennwort
-password_incorrect = Aktuelles Kennwort ist nicht korrekt.
-change_password_success = Kennwort erfolgreich geändert. Sie können nun mittels des neuen Kennwortes anmelden.
+change_password = Passwort ändern
+old_password = Aktuelles Passwort
+new_password = Neues Passwort
+password_incorrect = Aktuelles Passwort ist nicht korrekt.
+change_password_success = Passwort geändert. Du kannst dich jetzt mit dem neuen Passwort anmelden.
manage_ssh_keys = SSH-Schlüssel verwalten
-add_key = Schlüssel hinzufügen
-ssh_desc = This is a list of SSH keys associated with your account. Remove any keys that you do not recognize.
-ssh_helper = Need help? Check out our guide to generating SSH keys or troubleshoot common SSH Problems.
+add_key = SSH-Schlüssel hinzufügen
+ssh_desc = Dies ist eine Liste aller SSH-Schlüssel, die mit deinem Konto verknüpft sind. Entferne alle Schlüssel, die du nicht kennst.
+ssh_helper = Du brauchst Hilfe? Hier ist eine Anleitung zum Erzeugen von SSH-Schlüsseln oder Problemlösen einfacher SSH-Probleme.
add_new_key = SSH-Schlüssel hinzufügen
key_name = Schlüsselname
key_content = Inhalt
-add_key_success = New SSH Key has been added!
-delete_key = löschen
+add_key_success = SSH-Schlüssel hinzugefügt
+delete_key = SSH-Schlüssel löschen
add_on = Hinzugefügt am
last_used = Zuletzt verwendet auf
no_activity = Keine neuen Aktivitäten
-manage_social = Manage Associated Social Accounts
-social_desc = This is a list of associated social accounts. Remove any binding that you do not recognize.
+manage_social = Verknüpfte soziale Konten verwalten
+social_desc = Dies ist eine Liste verknüpfter sozialer Konten. Entferne alle Verknüpfungen, die du nicht kennst.
unbind = Verknüpfung entfernen
-unbind_success = Die Verknüpfung zum Social Konto wurde entfernt.
+unbind_success = Die Verknüpfung zum sozialen Konto wurde entfernt.
-delete_account = Löschen Sie Ihr Konto
-delete_prompt = Die Operation wird Ihr Konto dauerhaft löschen und kann NICHT rückgängig gemacht werden!
-confirm_delete_account = Löschung bestätigen
+delete_account = Konto löschen
+delete_prompt = Diese Aktion wird dein Konto dauerhaft löschen und kann NICHT rückgängig gemacht werden!
+confirm_delete_account = Löschen
[repo]
-owner = Eigentümer
-repo_name = Repositorie Name
-repo_name_helper = Tolle Repositorienamen sind kurz, einprägsam und einzigartig.
+owner = Besitzer
+repo_name = Repository-Name
+repo_name_helper = Gute Repository-Namen sind kurz, einprägsam und einzigartig.
visibility = Sichtbarkeit
-visiblity_helper = Dieses Repositorie ist Privat
+visiblity_helper = Dieses Repository ist Privat
repo_desc = Beschreibung
repo_lang = Sprache
-repo_lang_helper = Wählen Sie eine .gitignore Datei
+repo_lang_helper = Wähle eine .gitignore Datei
license = Lizenz
-license_helper = Wählen Sie eine Lizenzdatei aus
-init_readme = Initialisieren dieses Repository mit einem README.md
+license_helper = Wähle eine Lizenz aus
+init_readme = Repository mit README.md initialisieren
create_repo = Repository erstellen
-default_branch = Default Branch
-mirror_interval = Mirror Intervall(Stunden)
+default_branch = Standard-Branch
+mirror_interval = Spiegel-Intervall (in Stunden)
goget_meta = Go-Get Meta
-goget_meta_helper = This repository will be Go-Getable
+goget_meta_helper = Dieses Repository wird man mit go get klonen können.
-need_auth = Berechtigung erforderlich
+need_auth = Authorisierung benötigt
migrate_type = Migrationstyp
-migrate_type_helper = Dieses Repository wird ein Mirror
-migrate_repo = Repositorie migrieren
+migrate_type_helper = Dieses Repository wird ein Spiegel
+migrate_repo = Repository migrieren
-clone_helper = Need help cloning? Visit Help!
+copy_link = Klonen
+clone_helper = Du brauchst Hilfe beim Klonen? Hier gibt es Hilfe!
unwatch = Beobachtung beenden
watch = Beobachtung
unstar = Markierung aufheben
star = Markierung
fork = Abspaltung
+quick_guide = Kurzanleitung
+clone_this_repo = Dieses Repository klonen
+create_new_repo_command = Erstelle ein neues Repository mittels der Kommandozeile
+push_exist_repo = Übertrage ein existierendes Repository von der Kommandozeile
+
settings = Einstellungen
settings.options = Optionen
settings.collaboration = Zusammenarbeit
settings.hooks = Webhooks
-settings.deploy_keys = Schlüssel bereitstellen
+settings.deploy_keys = Deploy-Keys
settings.basic_settings = Grundeinstellungen
-settings.danger_zone = Danger Zone
-settings.site = Offizielle Website
+settings.danger_zone = Gefahrenzone
+settings.site = Offizielle Webseite
settings.update_settings = Aktualisierungseinstellungen
-settings.transfer = Eigentum übertragen
-settings.transfer_desc = Transfer this repo to another user or to an organization where you have admin rights.
-settings.delete = Dieses Repository löschen
-settings.delete_desc = Sobald Sie ein Repository löschen, gibt es keinen Weg zurück. Bitte seien Sie sicher.
-settings.update_settings_success = Repository Optionen wurde erfolgreich aktualisiert.
+settings.transfer = Besitz übertragen
+settings.transfer_desc = Übertrage dieses Repository einem anderen Benutzer oder einer Organisation.
+settings.new_owner_has_same_repo = Neuer Eigentümer hat bereits ein Repository mit dem gleichen Namen.
+settings.delete = Repository löschen
+settings.delete_desc = Wenn dieses Repository gelöschet ist, gibt es keinen Weg zurück. Sei dir sicher!
+settings.update_settings_success = Repository-Optionen aktualisiert
settings.transfer_owner = Neuer Besitzer
-settings.make_transfer = Make Transfer
-settings.confirm_delete = Löschung bestätigen
-settings.add_collaborator = Neuer Mitarbeiter hinzufügen
-settings.add_collaborator_success = Neuer Mitarbeiter wurde hinzugefügt.
-settings.remove_collaborator_success = Mitarbeiter wurde entfernt.
+settings.make_transfer = übertragen
+settings.transfer_succeed = Repository-Eigentum wurde erfolgreich übertragen.
+settings.confirm_delete = Löschen
+settings.add_collaborator = Mitarbeiter hinzufügen
+settings.add_collaborator_success = Mitarbeiter hinzugefügt
+settings.remove_collaborator_success = Mitarbeiter entfernt
settings.add_webhook = Webhook hinzufügen
-settings.hooks_desc = Webhooks allow external services to be notified when certain events happen on Gogs. When the specified events happen, we'll send a POST request to each of the URLs you provide. Learn more in our Webhooks Guide.
-settings.remove_hook_success = Webhook wurde entfernt.
-settings.add_webhook_desc = We’ll send a POST request to the URL below with details of any subscribed events. You can also specify which data format you'd like to receive (JSON, x-www-form-urlencoded, etc). More information can be found in Webhooks Guide.
-settings.payload_url = Payload URL
+settings.hooks_desc = Webhooks erlauben es externe Dienste zu informieren, wenn etwas bestimmtes in deinem Repository passiert. GoGS sendet dann eine POST-Request an alle angegebenen URLs. Erfahre mehr in unserem Webhooks Guide.
+settings.remove_hook_success = Webhook entfernt
+settings.add_webhook_desc = GoGS sendet einen POST-Request an die unten stehende URL mit Details aller abonierten Ereignisse. Du kannst auch angeben, welches Datenformat du erhalten willst (JSON, x-www-form-urlencoded, etc). Mehr Informationen findest du im Webhooks Guide.
+settings.payload_url = Payload-URL
settings.content_type = Inhaltstyp
-settings.secret = Geheimnis
-settings.event_desc = Durch welche Ereignisse würden Sie gerne diesen Webhook auslösen?
-settings.event_push_only = Just the push event.
+settings.secret = Secret
+settings.event_desc = Welche Ereignisse sollen diesen Webhook auslösen?
+settings.event_push_only = Nur das push-Ereignis.
settings.active = Aktiv
-settings.active_helper = We will deliver event details when this hook is triggered.
-settings.add_hook_success = Neuer Webhook wurde hinzugefügt.
+settings.active_helper = Ereignisdetails werden ausgeliefert, wenn dieser Webhook ausgelöst wird.
+settings.add_hook_success = Webhook hinzugefügt
settings.update_webhook = Webhook aktualisieren
-settings.update_hook_success = Webhook wurde aktualisiert.
+settings.update_hook_success = Webhook aktualisiert
settings.delete_webhook = Webhook löschen
-settings.recent_deliveries = Jüngste Zustellungen
+settings.recent_deliveries = letzte Zustellungen
+settings.hook_type = Hook Type
+settings.add_slack_hook_desc = Add Slack integration to your repository.
+settings.slack_token = Token
+settings.slack_domain = Domain
+settings.slack_channel = Channel
[org]
org_name_holder = Name der Organisation
-org_name_helper = Namen großer Organisationen sind kurz und einprägsam.
-org_email_helper = E-Mail der Organisation empfängt alle Benachrichtigungen und Bestätigungen.
+org_name_helper = Gute Namen von Organisationen sind kurz und einprägsam.
+org_email_helper = Das E-Mail-Konto der Organisation empfängt alle Benachrichtigungen.
create_org = Organisation erstellen
repo_updated = Aktualisiert
people = Personen
-invite_someone = Jemanden einladen
+invite_someone = Benutzer einladen
teams = Teams
lower_members = Mitglieder
-lower_repositories = Repositories
+lower_repositories = Repositorys
create_new_team = Neues Team erstellen
org_desc = Beschreibung
team_name = Teamname
team_desc = Beschreibung
-team_name_helper = Sie werden diesen Namen verwenden, um dieses Team in Gesprächen zu erwähnen.
-team_desc_helper = Was hat das Team auf sich?
+team_name_helper = Verwende diesen Namen, um dich auf dieses Team zu beziehen.
+team_desc_helper = Was hat es mit diesem Team auf sich?
team_permission_desc = Welche Berechtigungsstufe soll das Team haben?
settings = Einstellungen
@@ -254,68 +316,69 @@ settings.full_name = Vollständiger Name
settings.website = Webseite
settings.location = Standort
settings.update_settings = Aktualisierungseinstellungen
-settings.update_setting_success = Einstellung der Organisation wurde erfolgreich aktualisiert.
+settings.update_setting_success = Organisationseinstellungen aktualisiert
settings.delete = Organisation löschen
settings.delete_account = Diese Organisation löschen
-settings.delete_prompt = Die Operation wird diese Organisation dauerhaft löschen und kann NICHT rückgängig gemacht werden!
-settings.confirm_delete_account = Löschung bestätigen
+settings.delete_prompt = Die Organisation wird dauerhaft gelöscht. Dies kann NICHT rückgängig gemacht werden!
+settings.confirm_delete_account = Löschen
+settings.hooks_desc = Add webhooks that will be triggered for all repositories under this organization.
members.public = Öffentlich
members.public_helper = Privat machen
members.private = Privat
members.private_helper = Öffentlich machen
-members.owner = Eigentümer
+members.owner = Besitzer
members.member = Mitglied
members.conceal = Verbergen
members.remove = Entfernen
members.leave = Verlassen
-members.invite_desc = Start typing a username to invite a new member to %s:
+members.invite_desc = Benutzernamen eingeben, um ihn als neues Mitglied in %s einzuladen:
members.invite_now = Jetzt einladen
teams.join = Beitreten
teams.leave = Verlassen
teams.read_access = Lesezugriff
-teams.read_access_helper = This team will be able to view and clone its repositories.
+teams.read_access_helper = Dieses Team wird Repositorys einsehen und klonen können.
teams.write_access = Schreibzugriff
-teams.write_access_helper = This team will be able to read its repositories, as well as push to them.
+teams.write_access_helper = Dieses Team wird die Repositorys einsehen und in sie hinein pushen können.
teams.admin_access = Adminzugriff
-teams.admin_access_helper = This team will be able to push/pull to its repositories, as well as add other collaborators to them.
+teams.admin_access_helper = Dieses Team wird pull- und push-Rechte für die Repositorys haben und Mitarbeiter einladen können.
teams.no_desc = Dieses Team hat keine Beschreibung
teams.settings = Einstellungen
-teams.owners_permission_desc = Owners have full access to all repositories and have admin rights to the organization.
+teams.owners_permission_desc = Besitzer haben vollen Zugriff auf alle Repositorys und Admin Rechte für diese Organisation.
teams.members = Teammitglieder
teams.update_settings = Einstellungen aktualisieren
teams.delete_team = Dieses Team löschen
teams.add_team_member = Teammitglied hinzufügen
-teams.delete_team_success = Das Team wurde erfolgreich gelöscht.
-teams.read_permission_desc = This team grants Read access: members can view and clone the team's repositories.
-teams.write_permission_desc = This team grants Write access: members can read from and push to the team's repositories.
-teams.admin_permission_desc = This team grants Admin access: members can read from, push to, and add collaborators to the team's repositories.
-teams.repositories = Team Repositories
-teams.add_team_repository = Teamrepositorie hinzufügen
+teams.delete_team_success = Team gelöscht
+teams.read_permission_desc = Dieses Team erlaubt Lesezugriff: Mitglieder können Team-Repositorys einsehen und klonen.
+teams.write_permission_desc = Dieses Team erlaubt Schreibzugriff: Mitglieder können Team-Repositorys einsehen und hinein pushen.
+teams.admin_permission_desc = Diese Team erlaubt Adminzugriff: Mitglieder dieses Teams können pullen, pushen und dem Team Mitarbeiter hinzufügen.
+teams.repositories = Team-Repositorys
+teams.add_team_repository = Team-Repository hinzufügen
teams.remove_repo = Entfernen
[admin]
dashboard = Dashboard
users = Benutzer
organizations = Organisationen
-repositories = Repositories
+repositories = Repositorys
authentication = Authentifizierung
config = Konfiguration
monitor = Monitoring
-prev = Prev.
-next = Next
+prev = zurück
+next = vor
dashboard.statistic = Statistik
dashboard.operations = Operationen
-dashboard.system_status = System Monitor Status
-dashboard.statistic_info = Gogs database has %d users, %d organizations, %d public keys, %d repositories, %d watches, %d stars, %d actions, %d accesses, %d issues, %d comments, %d social accounts, %d follows, %d mirrors, %d releases, %d login sources, %d webhooks, %d milestones, %d labels, %d hook tasks, %d teams, %d update tasks, %d attachments.
+dashboard.system_status = System-Monitor-Status
+dashboard.statistic_info = GoGS Datenbank hat %d Benutzer, %d Organizationen, %d öffentliche Schlüssel, %d Repositorys, %d watches, %d stars, %d actions, %d Zugriffe, %d issues, %d Kommentare, %d soziale Konten, %d follows, %d Spiegel, %d Releases, %d Login-Quellen, %d Webhooks, %d Milestones, %d Labels, %d Hook-Tasks, %d Teams, %d Aktualisierungs-Tasks, %d Anhänge.
dashboard.operation_name = Operation Name
dashboard.operation_switch = Switch
-dashboard.operation_run = Run
-dashboard.clean_unbind_oauth = Clean unbound OAuthes
-dashboard.delete_inactivate_accounts = Alle inaktiven Konten löschen
-dashboard.server_uptime = Server Uptime
+dashboard.operation_run = Ausführen
+dashboard.clean_unbind_oauth = ungebundene OAuths bereinigen
+dashboard.delete_inactivate_accounts = inaktive Konten löschen
+dashboard.server_uptime = Server-Uptime
dashboard.current_goroutine = Aktuelle Goroutines
dashboard.current_memory_usage = Aktuelle Speichernutzung
dashboard.total_memory_allocated = Zugeteilter Gesamtspeicher
@@ -323,67 +386,66 @@ dashboard.memory_obtained = Erhaltener Speicher
dashboard.pointer_lookup_times = Pointer Lookup Times
dashboard.memory_allocate_times = Memory Allocate Times
dashboard.memory_free_times = Memory Free Times
-dashboard.current_heap_usage = Current Heap Usage
-dashboard.heap_memory_obtained = Heap Memory Obtained
-dashboard.heap_memory_idle = Heap Memory Idle
-dashboard.heap_memory_in_use = Heap Memory In Use
-dashboard.heap_memory_released = Heap Memory Released
-dashboard.heap_objects = Heap Objects
-dashboard.bootstrap_stack_usage = Bootstrap Stack Usage
-dashboard.stack_memory_obtained = Stack Memory Obtained
-dashboard.mspan_structures_usage = MSpan Structures Usage
-dashboard.mspan_structures_obtained = MSpan Structures Obtained
-dashboard.mcache_structures_usage = MCache Structures Usage
-dashboard.mcache_structures_obtained = MCache Structures Obtained
+dashboard.current_heap_usage = Aktuelle Heap-Auslastung
+dashboard.heap_memory_obtained = erhaltener Heap-Memory
+dashboard.heap_memory_idle = unbenutzter Heap-Memory
+dashboard.heap_memory_in_use = benutzter Heap-Memory
+dashboard.heap_memory_released = freigegebener Heap-Memory
+dashboard.heap_objects = Heap-Objekte
+dashboard.bootstrap_stack_usage = Bootstrap-Stack-Auslastung
+dashboard.stack_memory_obtained = erhaltener Stack-Memory
+dashboard.mspan_structures_usage = MSpan-Structures-Auslastung
+dashboard.mspan_structures_obtained = erhaltene MSpan-Structures
+dashboard.mcache_structures_usage = MCache-Structures-Auslastung
+dashboard.mcache_structures_obtained = erhaltene MCache-Structures
dashboard.profiling_bucket_hash_table_obtained = Profiling Bucket Hash Table Obtained
-dashboard.gc_metadata_obtained = GC Metadada Obtained
-dashboard.other_system_allocation_obtained = Other System Allocation Obtained
-dashboard.next_gc_recycle = Next GC Recycle
-dashboard.last_gc_time = Since Last GC Time
-dashboard.total_gc_time = Total GC Pause
-dashboard.total_gc_pause = Total GC Pause
-dashboard.last_gc_pause = Last GC Pause
-dashboard.gc_times = GC Takt
+dashboard.gc_metadata_obtained = erhaltene GC-Metadata
+dashboard.other_system_allocation_obtained = andere erhaltene System-Allokatoren
+dashboard.next_gc_recycle = nächster GC-Zyklus
+dashboard.last_gc_time = seit letztem GC-Zyklus
+dashboard.total_gc_time = gesammte GC-Zeit
+dashboard.total_gc_pause = gesammte GC-Pause
+dashboard.last_gc_pause = letzte GC-Pause
+dashboard.gc_times = GC-Takt
-users.user_manage_panel = User Manage Panel
+users.user_manage_panel = Benutzer
users.new_account = Neues Konto erstellen
users.name = Name
-users.email = E-mail
users.activated = Aktiviert
users.admin = Admin
-users.repos = Repos
+users.repos = Repositorys
users.created = Erzeugt
users.edit = Bearbeiten
-users.auth_source = Auth Source
+users.auth_source = Auth-Quelle
users.local = Lokal
-users.auth_login_name = Auth Login Name
-users.update_profile_success = Kontoprofil wurde erfolgreich aktualisiert.
+users.auth_login_name = Auth-Login-Name
+users.update_profile_success = Kontoprofil aktualisiert
users.edit_account = Konto bearbeiten
users.is_activated = Dieses Konto ist aktiviert
users.is_admin = Dieses Konto hat Administratorrechte
-users.update_profile = Kontopprofil aktualisieren
+users.update_profile = Kontoprofil aktualisieren
users.delete_account = Dieses Konto löschen
-users.still_own_repo = Dieses Konto ist noch Eigentümer von Repositories, Sie müssen zuerst diese löschen oder übertragen.
+users.still_own_repo = Dieses Konto besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden.
-orgs.org_manage_panel = Organization Manage Panel
+orgs.org_manage_panel = Organisationenverwaltung
orgs.name = Name
orgs.teams = Teams
orgs.members = Mitglieder
-repos.repo_manage_panel = Repository Manage Panel
-repos.owner = Eigentümer
+repos.repo_manage_panel = Repositorys
+repos.owner = Besitzer
repos.name = Name
repos.private = Privat
repos.watches = Watches
repos.stars = Stars
-repos.issues = Themen
+repos.issues = Issues
-auths.auth_manage_panel = Authorization Manage Panel
-auths.new = Neu Authentifizierungsquelle hinzufügen
+auths.auth_manage_panel = Authentifizierung
+auths.new = Neue Authentifizierungsquelle hinzufügen
auths.name = Name
auths.type = Typ
-auths.enabled = Aktiviert
-auths.updated = Aktualisiert
+auths.enabled = aktiviert
+auths.updated = aktualisiert
auths.auth_type = Authentifizierungstyp
auths.auth_name = Authentifizierungsname
auths.domain = Domain
@@ -393,30 +455,30 @@ auths.base_dn = Base DN
auths.attributes = Suchattribute
auths.filter = Suchfilter
auths.ms_ad_sa = Ms Ad SA
-auths.smtp_auth = SMTP Authentifizierungstyp
-auths.smtphost = SMTP Host
-auths.smtpport = SMTP Port
+auths.smtp_auth = SMTP-Authentifizierungstyp
+auths.smtphost = SMTP-Host
+auths.smtpport = SMTP-Port
auths.enable_tls = TLS-Verschlüsselung aktivieren
auths.enable_auto_register = Automatische Registrierung aktivieren
auths.tips = Tipps
auths.edit = Authentifizierungseinstellungen bearbeiten
auths.activated = Diese Authentifizierung ist aktiviert
-auths.update_success = Authentifizierungseinstellungen wurde erfolgreich aktualisiert.
+auths.update_success = Authentifizierungseinstellungen aktualisiert
auths.update = Authentifizierungseinstellungen aktualisieren
-auths.delete = Diese Authentifizierung löschen
+auths.delete = Authentifizierung löschen
config.server_config = Server-Konfiguration
config.app_name = Anwendungsname
config.app_ver = Anwendungsversion
-config.app_url = Anwendungs URL
+config.app_url = Anwendungs-URL
config.domain = Domain
-config.offline_mode = Offline Mode
-config.disable_router_log = Router Log deaktivieren
-config.run_user = Run User
-config.run_mode = Run Mode
-config.repo_root_path = Repositorie Wurzelverzeichnis
-config.static_file_root_path = Wurzelverzeichnis für statische Dateien
-config.log_file_root_path = Wurzelverzeichnis für Log Dateien
+config.offline_mode = Offline-Modus
+config.disable_router_log = Router-Log deaktivieren
+config.run_user = Laufzeit-Benutzer
+config.run_mode = Laufzeit-Modus
+config.repo_root_path = Repository-Verzeichnis
+config.static_file_root_path = Verzeichnis für statische Dateien
+config.log_file_root_path = Log-Verzeichnis
config.script_type = Skript-Typ
config.reverse_auth_user = Reverse Authentication User
config.db_config = Datenbankkonfiguration
@@ -424,54 +486,54 @@ config.db_type = Typ
config.db_host = Host
config.db_name = Name
config.db_user = Benutzer
-config.db_ssl_mode = SSL Modus
+config.db_ssl_mode = SSL-Modus
config.db_ssl_mode_helper = (nur für "postgres")
config.db_path = Verzeichnis
config.db_path_helper = (nur für "sqlite3")
-config.service_config = Service Einstellungen
-config.register_email_confirm = E-Mail Bestätigung bei Registrierung
+config.service_config = Service-Einstellungen
+config.register_email_confirm = E-Mail-Bestätigung bei Registrierung
config.disable_register = Registrierung deaktivieren
config.require_sign_in_view = Require Sign In View
-config.mail_notify = E-Mail Benachrichtigung
-config.enable_cache_avatar = Avatar Cache avtivieren
+config.mail_notify = E-Mail-Benachrichtigung
+config.enable_cache_avatar = Avatar-Cache aktivieren
config.active_code_lives = Active Code Lives
config.reset_password_code_lives = Reset Password Code Lives
-config.webhook_config = Webhook Einstellungen
-config.task_interval = Task Intervall
+config.webhook_config = Webhook-Einstellungen
+config.task_interval = Task-Intervall
config.deliver_timeout = Zeitlimit für Zustellung
-config.mailer_config = Mailer Einstellungen
+config.mailer_config = Mailer-Einstellungen
config.mailer_enabled = Aktiviert
config.mailer_name = Name
config.mailer_host = Host
config.mailer_user = Benutzer
-config.oauth_config = OAuth Einstellungen
+config.oauth_config = OAuth-Einstellungen
config.oauth_enabled = Aktiviert
-config.cache_config = Cache Einstellungen
-config.cache_adapter = Cache Adapter
-config.cache_interval = Cache Intervall
-config.cache_conn = Cache Anbindung
-config.session_config = Session Einstellungen
-config.session_provider = Session Provider
-config.provider_config = Provider Einstellungen
-config.cookie_name = Cookie Name
+config.cache_config = Cache-Einstellungen
+config.cache_adapter = Cache-Adapter
+config.cache_interval = Cache-Intervall
+config.cache_conn = Cache-Anbindung
+config.session_config = Session-Einstellungen
+config.session_provider = Session-Provider
+config.provider_config = Provider-Einstellungen
+config.cookie_name = Cookie-Name
config.enable_set_cookie = Enable Set Cookie
-config.gc_interval_time = GC Interval Time
-config.session_life_time = Session Lebensdauer
+config.gc_interval_time = GC-Intervallzeit
+config.session_life_time = Session-Lebensdauer
config.https_only = nur HTTPS
-config.cookie_life_time = Cookie Lebensdauer
-config.session_hash_function = Session ID Hash Function
-config.session_hash_key = Session ID Hash Key
-config.picture_config = Bildereinstellungen
-config.picture_service = Bilderservice
+config.cookie_life_time = Cookie-Lebensdauer
+config.session_hash_function = Session-ID-Hashfunktion
+config.session_hash_key = Session-ID-Hashschlüssel
+config.picture_config = Bildeinstellungen
+config.picture_service = Bildservice
config.disable_gravatar = Gravatar deaktivieren
-config.log_config = Log Einstellungen
-config.log_mode = Log Modus
+config.log_config = Log-Einstellungen
+config.log_mode = Log-Modus
-monitor.cron = Cron Tasks
+monitor.cron = Cron-Tasks
monitor.name = Name
monitor.schedule = Zeitplan
-monitor.next = Next Time
-monitor.previous = Previous Time
+monitor.next = nächste Ausführung
+monitor.previous = letzte Ausführung
monitor.execute_times = Execute Times
monitor.process = Laufende Prozesse
monitor.desc = Beschreibung
@@ -479,10 +541,11 @@ monitor.start = Startzeit
monitor.execute_time = Ausführungszeit
[action]
-create_repo = Repositorie erstellen %s
-commit_repo = pushed to %s at %s
-create_issue = opened issue %s#%s
-comment_issue = commented on issue %s#%s
+create_repo = hat Repository %s erstellt
+commit_repo = hat nach %s in %s gepusht
+create_issue = hat Issue %s#%s eröffnet
+comment_issue = hat Issue %s#%s kommentiert
+transfer_repo = hat Repository %s transferiert an %s
[tool]
ago = vor
@@ -504,16 +567,3 @@ months = %d Monate %s
years = %d Jahre %s
raw_seconds = Sekunden
raw_minutes = Minuten
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 3dfbdc3aad..8e68fb9803 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -38,6 +38,50 @@ issues = Issues
cancel = Cancel
+[install]
+install = Installation
+title = Install Steps For First-time Run
+requite_db_desc = Gogs requires MySQL, PostgreSQL or SQLite3, but SQLite3 is usually available in the official binary version.
+db_type = Database Type
+host = Host
+user = User
+password = Password
+db_name = Database Name
+db_helper = Please use INNODB engine with utf8_general_ci charset for MySQL.
+ssl_mode = SSL Mode
+path = Path
+sqlite_helper = The file path of SQLite3 database.
+general_title = General Settings of Gogs
+repo_path = Repository Root Path
+repo_path_helper = All Git remote repositories will be saved to this directory.
+run_user = Run User
+run_user_helper = The user must have access to Repository Root Path and run Gogs.
+domain = Domain
+domain_helper = This affects SSH clone URLs.
+app_url = Application URL
+app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in e-mail.
+email_title = Email Service Settings(Optional)
+smtp_host = SMTP Host
+mailer_user = Sender E-mail
+mailer_password = Sender Password
+notify_title = Notification Settings(Optional)
+register_confirm = Enable Register Confirmation
+mail_notify = Enable Mail Notification
+admin_title = Admin Account Settings
+admin_name = Username
+admin_password = Password
+confirm_password = Confirm Password
+admin_email = E-mail
+install_gogs = Install Gogs
+test_git_failed = Fail to test 'git' command: %v
+sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from http://gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version.
+invalid_db_setting = Database setting is not correct: %v
+invalid_repo_path = Repository root path is invalid: %v
+run_user_not_match = Run user isn't the current user: %s -> %s
+save_config_failed = Fail to save configuration: %v
+invalid_admin_setting = Admin account setting is invalid: %v
+install_success = Welcome! We're glad that you choose Gogs, have fun and take care.
+
[home]
uname_holder = Username or E-mail
password_holder = Password
@@ -47,6 +91,9 @@ collaborative_repos = Collaborative Repositories
my_orgs = My Organizations
my_mirrors = My Mirrors
+[explore]
+repos = Repositories
+
[auth]
create_new_account = Create New Account
register_hepler_msg = Already have an account? Sign in now!
@@ -81,6 +128,7 @@ HttpsUrl = HTTPS URL
PayloadUrl = Payload URL
TeamName = Team name
AuthName = Authorization name
+AdminEmail = Admin E-mail
require_error = ` cannot be empty.`
alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.`
@@ -91,7 +139,7 @@ email_error = ` is not a valid e-mail address.`
url_error = ` is not a valid URL.`
unknown_error = Unknown error:
captcha_incorrect = Captcha didn't match.
-password_not_match = Password and re-type password are not same.
+password_not_match = Password and confirm password are not same.
username_been_taken = Username has been already taken.
repo_name_been_taken = Repository name has been already taken.
@@ -118,6 +166,15 @@ org_still_own_repo = This organization still have ownership of repository, you h
still_own_user = This authentication still has used by some users, you should move them and then delete again.
+[user]
+change_avatar = Change your avatar at gravatar.com
+join_on = Joined on
+repositories = Repositories
+activity = Public Activity
+followers = Followers
+starred = Starred
+following = Following
+
[settings]
profile = Profile
password = Password
@@ -125,6 +182,7 @@ ssh_keys = SSH Keys
social = Social Accounts
orgs = Organizations
delete = Delete Account
+uid = Uid
public_profile = Public Profile
profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.
@@ -133,6 +191,10 @@ website = Website
location = Location
update_profile = Update Profile
update_profile_success = Your profile has been successfully updated.
+change_username = Username Changed
+change_username_desc = Username has been changed, do you want to continue? This will affect all links relate to your account.
+continue = Continue
+cancel = Cancel
change_password = Change Password
old_password = Current Password
@@ -159,8 +221,10 @@ unbind = Unbind
unbind_success = Social account has been unbound.
delete_account = Delete Your Account
-delete_prompt = The operation will delete your account permanently, and CANNOT be undo!
+delete_prompt = The operation will delete your account permanently, and CANNOT be undone!
confirm_delete_account = Confirm Deletion
+delete_account_title = Account Deletion
+delete_account_desc = This account is going to be deleted permanently, do you want to continue?
[repo]
owner = Owner
@@ -185,6 +249,9 @@ migrate_type = Migration Type
migrate_type_helper = This repository will be a Mirror
migrate_repo = Migrate Repository
+copy_link = Copy
+click_to_copy = Copy to clipboard
+copied = Copied OK
clone_helper = Need help cloning? Visit Help!
unwatch = Unwatch
watch = Watch
@@ -192,6 +259,30 @@ unstar = Unstar
star = Star
fork = Fork
+no_desc = No Description
+quick_guide = Quick Guide
+clone_this_repo = Clone this repository
+create_new_repo_command = Create a new repository on the command line
+push_exist_repo = Push an existing repository from the command line
+
+branch = Branch
+tree = Tree
+branch_and_tags = Branches & Tags
+branches = Branches
+tags = Tags
+issues = Issues
+commits = Commits
+releases = Releases
+
+commits.commits = Commits
+commits.search = Search commits
+commits.find = Find
+commits.author = Author
+commits.message = Message
+commits.date = Date
+commits.older = Older
+commits.newer = Newer
+
settings = Settings
settings.options = Options
settings.collaboration = Collaboration
@@ -201,13 +292,18 @@ settings.basic_settings = Basic Settings
settings.danger_zone = Danger Zone
settings.site = Official Site
settings.update_settings = Update Settings
+settings.change_reponame = Repository Name Changed
+settings.change_reponame_desc = Repository name has been changed, do you want to continue? This will affect all links relate to this repository.
settings.transfer = Transfer Ownership
settings.transfer_desc = Transfer this repo to another user or to an organization where you have admin rights.
+settings.new_owner_has_same_repo = New owner already has a repository with same name.
settings.delete = Delete This Repository
settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
+settings.transfer_notices =
- You will lose access if new owner is a individual user.
- You will remain access if new owner is an organization and you're one of the owners.
settings.update_settings_success = Repository options has been successfully updated.
settings.transfer_owner = New Owner
settings.make_transfer = Make Transfer
+settings.transfer_succeed = Repository ownership has been successfully transferred.
settings.confirm_delete = Confirm Deletion
settings.add_collaborator = Add New Collaborator
settings.add_collaborator_success = New collaborator has been added.
@@ -228,6 +324,11 @@ settings.update_webhook = Update Webhook
settings.update_hook_success = Webhook has been updated.
settings.delete_webhook = Delete Webhook
settings.recent_deliveries = Recent Deliveries
+settings.hook_type = Hook Type
+settings.add_slack_hook_desc = Add Slack integration to your repository.
+settings.slack_token = Token
+settings.slack_domain = Domain
+settings.slack_channel = Channel
[org]
org_name_holder = Organization Name
@@ -254,11 +355,16 @@ settings.full_name = Full Name
settings.website = Website
settings.location = Location
settings.update_settings = Update Settings
+settings.change_orgname = Organization Name Changed
+settings.change_orgname_desc = Organization name has been changed, do you want to continue? This will affect all links relate to this organization.
settings.update_setting_success = Organization setting has been successfully updated.
settings.delete = Delete Organization
settings.delete_account = Delete This Organization
-settings.delete_prompt = The operation will delete this organization permanently, and CANNOT be undo!
+settings.delete_prompt = The operation will delete this organization permanently, and CANNOT be undone!
settings.confirm_delete_account = Confirm Deletion
+settings.delete_org_title = Organization Deletion
+settings.delete_org_desc = This organization is going to be deleted permanently, do you want to continue?
+settings.hooks_desc = Add webhooks that will be triggered for all repositories under this organization.
members.public = Public
members.public_helper = make private
@@ -287,6 +393,8 @@ teams.members = Team Members
teams.update_settings = Update Settings
teams.delete_team = Delete This Team
teams.add_team_member = Add Team Member
+teams.delete_team_title = Team Deletion
+teams.delete_team_desc = This team is going to be deleted, do you want to continue? Members of this team may lose access to some repositories.
teams.delete_team_success = Given team has been successfully deleted.
teams.read_permission_desc = This team grants Read access: members can view and clone the team's repositories.
teams.write_permission_desc = This team grants Write access: members can read from and push to the team's repositories.
@@ -403,6 +511,8 @@ auths.activated = This authentication has activated
auths.update_success = Authorization setting has been successfully updated.
auths.update = Update Authorization Setting
auths.delete = Delete This Authorization
+auths.delete_auth_title = Authorization Deletion
+auths.delete_auth_desc = This authorization is going to be deleted, do you want to continue?
config.server_config = Server Configuration
config.app_name = Application Name
@@ -478,10 +588,11 @@ monitor.start = Start Time
monitor.execute_time = Execution Time
[action]
-create_repo = created repository %s
-commit_repo = pushed to %s at %s
-create_issue = opened issue %s#%s
-comment_issue = commented on issue %s#%s
+create_repo = created repository %s
+commit_repo = pushed to %s at %s
+create_issue = opened issue %s#%s
+comment_issue = commented on issue %s#%s
+transfer_repo = transfered repository %s to %s
[tool]
ago = ago
diff --git a/conf/locale/locale_fr-CA.ini b/conf/locale/locale_fr-CA.ini
new file mode 100644
index 0000000000..3f5d705fc7
--- /dev/null
+++ b/conf/locale/locale_fr-CA.ini
@@ -0,0 +1,516 @@
+app_desc = Un service Git écrit en Go auto-hébergé
+
+home = Accueil
+dashboard = Tableau de bord
+explore = Explorer
+help = Aide
+sign_in = Connexion
+social_sign_in = Authentification via Internet: 2ème étape associé le compte
+sign_out = Déconnexion
+sign_up = Créer un compte
+register = S'inscrire
+website = Site web
+version = Version
+page = Page
+template = Gabarit
+language = Langage
+
+username = Usager
+email = Courriel
+password = Mot de passe
+re_type = Saisir à nouveau
+captcha = Captcha
+
+repository = Dépôt
+organization = Organisation
+mirror = Mirroir
+new_repo = Nouveau dépôt
+new_migrate = Nouvelle migration
+new_org = Nouvel organisation
+manage_org = Gestion des organisations
+admin_panel = Gestion
+account_settings = Profil usager
+settings = Configuration
+
+news_feed = Fil de nouvelles
+pull_requests = Demandes de fusion (pull requests)
+issues = Suivi de problèmes
+
+cancel = Annuler
+
+[home]
+uname_holder = Nom d'usager ou courriel
+password_holder = Mot de passe
+switch_dashboard_context = Changer de tableau de bord
+my_repos = Mes dépôts
+collaborative_repos = Dépôts partagés
+my_orgs = Mes organisations
+my_mirrors = Mes mirroirs
+
+[auth]
+create_new_account = Créer un nouveau compte
+register_hepler_msg = Déjà inscrits? Connectez-vous maintenant!
+social_register_hepler_msg = Déjà inscrits? Branchez-vous!
+disable_register_prompt = Désolé, l'auto-inscription n'est pas activée. Contactez l'admnistrateur du site.
+disable_register_mail = Désolé, la confirmation d'inscription par courriel est désactivée. Contactez l'administrateur du site.
+remember_me = Se souvenir de moi
+forgot_password= Mot de passe oublié
+forget_password = Mot de passe oublié?
+sign_up_now = Besoin d'un compte? Inscrivez-vous maintenant.
+confirmation_mail_sent_prompt = Un courriel de confirmation à été envoyé à %s, consultez vos courriels d'ici %d heures pour terminer l'inscription.
+sign_in_email = Connexion avec votre courriel
+active_your_account = Activez votre compte
+resent_limit_prompt = Désolé vous demandez trop souvent un courriel de confirmation. S.v.p. patientez 3 minutes.
+has_unconfirmed_mail = Bonjour %s, votre adresse courriel n'est pas vérifiée(%s). Si vous n'avez pas reçu de courriel de confirmation ou si vous avez besoin d'en envoyer un maintenant, appuyez sur le bouton ci-dessous.
+resend_mail = Appuyez ici pour envoyer de nouveau un courriel de confirmation.
+email_not_associate = Ce courriel ne correspond à aucun compte.
+send_reset_mail = Appuyez ici pour (ré)envoyer un courriel pour réinitialiser le mot de passe.
+reset_password = Réinitialiser votre mot de passe
+invalid_code = Désolé, ce code de confirmation est périmé ou non-valide.
+reset_password_helper = Appuyez ici pour réinitialiser votre mot de passe
+password_too_short = La longueur du mot de passe doit être d'au moins 6 caractères.
+
+[form]
+UserName = Nom d'usager
+RepoName = Nom du dépôt
+Email = Adresse de courriel
+Password = Mot de passe
+Retype = Mot de passe (confirmation)
+SSHTitle = Nom de la clé SSH
+HttpsUrl = URL HTTPS
+PayloadUrl = URL cible
+TeamName = Nom de l'équipe
+AuthName = Nom d'usager
+
+require_error = ` ne peut être vide.`
+alpha_dash_error = ` doit être composé de caractères alpha-numériques et/ou d'un tiret(-_).`
+alpha_dash_dot_error = ` doit être composé de caractères alpha-numérique, un point(.) et/ou tiret(-_).`
+min_size_error = ` doit être composé d'au moins %s caractères.`
+max_size_error = ` doit être conposé d'au plus %s caractères.`
+email_error = ` n'est pas une adresse de courriel bien formée.`
+url_error = ` n'est pas un URL valide.`
+unknown_error = Erreur inconnue:
+captcha_incorrect = Le captcha ne concorde pas.
+password_not_match = Les deux mots de passe diffèrent.
+
+username_been_taken = `Nom d'usager dèjà utilisé.`
+repo_name_been_taken = Nom de dépôt déjà utilisé.
+org_name_been_taken = Nom d'organisation déjà utilisé.
+team_name_been_taken = Nom d'équipe déjà utilisé.
+email_been_used = Adresse de courriel déjà utilisée.
+ssh_key_been_used = Nom de clé publique déjà utilisé.
+illegal_username = Votre nom d'usager contient des caractères interdits.
+illegal_repo_name = Le nom du dépôt contient des caractères interdits.
+illegal_org_name = Le nom de l'organisation contient des caractères interdits.
+illegal_team_name = Le nom de l'équipe contient des caractères interdits.
+username_password_incorrect = Nom d'usager ou mot de passe erroné.
+enterred_invalid_repo_name = Nom de dépôt inexistant.
+enterred_invalid_owner_name = Responsable de dépôt inexistant.
+enterred_invalid_password = Mot de passe erroné.
+user_not_exist = Nom d'usager inexistant.
+last_org_owner = Ceci est le dernier responsable du dépôt. Il doit y avoir obligatoirement au moins un usager responsable.
+
+invalid_ssh_key = Désolé, impossible de vérifier votre clé SSH: %
+auth_failed = Erreur d'authentification : %v
+
+still_own_repo = Votre compte est responsable d'au moins un dépôt. Vous devez soit détruire ces dépôts, soit transférer la responsabilité à un autre usager.
+org_still_own_repo = Cette organisation est responsable d'au moins un dépôt. Vous devez soit détruire ces dépôts, soit transférer la responsabilité à un autre usager ou organisation.
+
+still_own_user = Cette authentification est utilisée par un usager.
+
+[settings]
+profile = Profil
+password = Mot de passe
+ssh_keys = Clés SSH
+social = Comptes Internet
+orgs = Organisations
+delete = Supprimer votre compte
+
+public_profile = Profil public
+profile_desc = Votre adresse de courriel est publique et sera utilisée pour les avis produits par le site.
+full_name = Nom complet
+website = Site web
+location = Endroit
+update_profile = Mettre à jour le profil
+update_profile_success = Mise à jour du profil réussie.
+
+change_password = Changer le mot de passe
+old_password = Mot de passe actuel
+new_password = Nouveau mot de passe
+password_incorrect = Mot de passe actuel erroné.
+change_password_success = Modification du mot de passe effectuée. Vous pouvez dorénavant vous connecter avec le nouveau mot de passe.
+
+manage_ssh_keys = Gestion des clés SSH
+add_key = Ajouter une clé
+ssh_desc = Voici la liste de clés SSH associées à votre profil. Retirez les clés que vous ne reconnaissez pas.
+ssh_helper = Beson d'aide? Consultez le guide au generating SSH keys ou vérifiez les problèmes SSH fréquents.
+add_new_key = Ajouter une clé SSH
+key_name = Nom de la clé
+key_content = Contenu
+add_key_success = Clé SSH ajoutée!
+delete_key = Détruire
+add_on = Ajoutée le
+last_used = Dernière utilisation le
+no_activity = Pas d'activité récente
+
+manage_social = Gestion des comptes Internets associés
+social_desc = Ceci est une liste de comptes Internet associés. Retirez les comptes que vous ne reconnaissez pas.
+unbind = Désassocier
+unbind_success = Compte Internet déassocié.
+
+delete_account = Detruire votre compte
+delete_prompt = Cette opération détruira votre compte et ne pourra être annulée!
+confirm_delete_account = Confirmez la suppression
+
+[repo]
+owner = Responsable
+repo_name = Nom du dépôt
+repo_name_helper = Les bons noms de dépôts sont courts, mémorables et uniques.
+visibility = Visibilité
+visiblity_helper = Ce dépôt est privé
+repo_desc = Description
+repo_lang = Langue
+repo_lang_helper = Choisir un fichier .gitignore
+license = License
+license_helper = Choisir un fichier de licence
+init_readme = Initialiser le dépôt avec un fichier README.md
+create_repo = Créer le dépôt
+default_branch = Branche par défaut
+mirror_interval = Intervale de synchronisation (heures)
+goget_meta = Métadonnées Go-Get
+goget_meta_helper = Ce dépôt sera Go-Getable
+
+need_auth = Authorisation requise
+migrate_type = Type de migration
+migrate_type_helper = Ce dépôt sera un mirroir
+migrate_repo = Migrer le dépôt
+
+copy_link = Copier
+clone_helper = Besoin d'aide pour cloner? Obtenez de l' aide!
+unwatch = Ne plus suivre
+watch = Suivre
+unstar = Retirer étoile
+star = Étoile
+fork = Fork
+
+quick_guide = Guide rapide
+clone_this_repo = Cloner ce dépôt
+create_new_repo_command = Créer un nouveau dépôt à la ligne de commande
+push_exist_repo = Pousser un dépôt existant depuis la ligne de commande
+
+settings = Réglages
+settings.options = Réglages de base
+settings.collaboration = Collaboration
+settings.hooks = Webhooks
+settings.deploy_keys = Clé de déploiement
+settings.basic_settings = réglages de base
+settings.danger_zone = Danger!
+settings.site = Site officiel
+settings.update_settings = Réglage des mises à jour
+settings.transfer = Transférer la responsabilité
+settings.transfer_desc = Transférer ce dépôt à un autre usager ou organisation si vous en avez la responsabilité.
+settings.delete = Détruire ce dépôt
+settings.delete_desc = La destruction est irrémédiable, impossible d'annuler. Soyez sûr de votre décision.
+settings.update_settings_success = Réglages modifiés
+settings.transfer_owner = Nouveau responsable
+settings.make_transfer = Faire le transfert
+settings.confirm_delete = Confirmer la destruction
+settings.add_collaborator = Ajouter un nouveau collaborateur
+settings.add_collaborator_success = Nouveau collaborateur ajouté.
+settings.remove_collaborator_success = Collaborateur supprimé.
+settings.add_webhook = Ajouter un Webhook
+settings.hooks_desc = Les Webhooks permettent à des services externes d'être avertis de certains changements sur Gogs. Lorque qu'un changement se produit, Gogs envoie une requête POST à chacun des URLs spécifiés. Plus d'info disponible sur notre guide Webhooks'.
+settings.remove_hook_success = Webhook supprimé.
+settings.add_webhook_desc = Gogs envoiera un POST à l'URL ci-dessous avec le détail de l'événement souscrit. Vous pouvez aussi spécifier dans quel format vous désirez recevoir les données (JSON,x-www-form-urlencoded, etc). Plus d'info disponible sur notre guide Webhooks'.
+settings.payload_url = URL cible
+settings.content_type = Content Type
+settings.secret = Secret
+settings.event_desc = Quels changements déclencheront le webhook?
+settings.event_push_only = Uniquement les push.
+settings.active = Activé
+settings.active_helper = Gogs fournira le détail de l'événement lorsque ce webhook sera déclenché.
+settings.add_hook_success = Nouveau webhook ajouté.
+settings.update_webhook = Mettre à jour le webhook
+settings.update_hook_success = Webhook mis à jour.
+settings.delete_webhook = Détruire le webhook
+settings.recent_deliveries = Livraisons récentes
+settings.hook_type = Type de déclencheur
+settings.add_slack_hook_desc = Ajouter la compatibilité Slack à ce dépôt.
+settings.slack_token = Jeton (token)
+settings.slack_domain = Domaine
+settings.slack_channel = Canal
+
+[org]
+org_name_holder = Nom de l'organisation
+org_name_helper = Les bons noms d'organisations sont courts, mémorables et uniques
+org_email_helper = Le courriel de l'organisation recevra toutes les notifications et les confirmations.
+create_org = Créer une organisation
+repo_updated = Changement effectué
+people = Personne
+invite_someone = Inviter quelqu'un
+teams = Équipes
+lower_members = Membres
+lower_repositories = Dépôts
+create_new_team = Créer une nouvelle équipe
+org_desc = Description
+team_name = Nom de l'équipe
+team_desc = Description
+team_name_helper = Le nom qui sera utilisé pour mentionner cette équipe dans les conversations.
+team_desc_helper = Quel est la raison d'être de cette équipe?
+team_permission_desc = Quel niveau de permission attribuer à cette équipe?
+
+settings = Réglages
+settings.options = Paramètres
+settings.full_name = Nom complet
+settings.website = Site web
+settings.location = Endroit
+settings.update_settings = Mettre à jour les paramètres
+settings.update_setting_success = Paramètres mis à jour.
+settings.delete = Détruire l'organisation
+settings.delete_account = Détruire cette organisation
+settings.delete_prompt = La destruction de l'organisation est irrémédiable, impossible d'annuler. Soyez sûr de votre décision.
+settings.confirm_delete_account = Confirmer la destruction
+
+members.public = Publique
+members.public_helper = Rendre privé
+members.private = Privé
+members.private_helper = Rendre publique
+members.owner = Responsable
+members.member = Membre
+members.conceal = Caché
+members.remove = Retirer
+members.leave = Quitter
+members.invite_desc = Commencez à saisir un nom d'usager pour l'inviter à %s:
+members.invite_now = Inviter
+
+teams.join = Rejoindre
+teams.leave = Quitter
+teams.read_access = Droits de lecture
+teams.read_access_helper = Cette équipe pourra voir et cloner ses dépôts.
+teams.write_access = Droits d'écriture
+teams.write_access_helper = Cette équipe pourra voir et cloner ses dépôts ainsi que pousser vers ceux-ci.
+teams.admin_access = Droits de gestion
+teams.admin_access_helper = En plus des droits d'écriture, cette équipe pourra gérer les collaborateurs.
+teams.no_desc = Cette équipe ne posséde pas de description
+teams.settings = Réglages
+teams.owners_permission_desc = Les responsables ont accès à tous les dépôts et en possédent les droits de gestion.
+teams.members = Membre de l'équipe
+teams.update_settings = Mettre à jour
+teams.delete_team = Détruire cette équipe
+teams.add_team_member = Ajouter un membre à l'équipe
+teams.delete_team_success = Équipe détruite
+teams.read_permission_desc = La participation à cette équipe confère les droits de lecture. Ses membres peuvent voir et cloner ses dépôts.
+teams.write_permission_desc = La participation à cette équipe confère les droits d'écriture en plus des droits de lecture. Ses membres peuvent pousser vers les dépôts de l'équipe.
+teams.admin_permission_desc = La participation à cette équire confère les droits de gestion. Ses membres peuvent voir, cloner, pousser et gérer les collaborateurs des dépôts.
+teams.repositories = Dépôts de l'équipe
+teams.add_team_repository = Ajouer un dépôt à l'équipe
+teams.remove_repo = Enlever
+
+[admin]
+dashboard = Tableau de bord
+users = Usagers
+organizations = Organisations
+repositories = Dépôts
+authentication = Sources d'authentifications
+config = Configuration
+monitor = Monitoring
+prev = Préc.
+next = Suiv.
+
+dashboard.statistic = Statistiques
+dashboard.operations = Opérations
+dashboard.system_status = État du monitoring système
+dashboard.statistic_info = La BD Gogs compte %d usagers, %d organisations, %d clé SSH, %d dépôts, %d suivis, %d étoiles, %d actions, %d accès, %d tickets, %d commentaires, %d comptes Internet, %d suivis, %d mirroirs, %d publications, %d sources d'authentification, %d webhooks, %d jalons, %d tags, %d tâches hook, %d équipes, %d tâches de mise à jours, %d fichiers joints.
+dashboard.operation_name = Nom de l'opération
+dashboard.operation_switch = Commande
+dashboard.operation_run = Lancer
+dashboard.clean_unbind_oauth = Nettoyer les OAuths orphelins
+dashboard.delete_inactivate_accounts = Détruire les comptes inactifs
+dashboard.server_uptime = Démarré depuis
+dashboard.current_goroutine = Nombre de Goroutines
+dashboard.current_memory_usage = Usage mémoire actuel
+dashboard.total_memory_allocated = Mémoire allouée totale
+dashboard.memory_obtained = Memoire obtenue
+dashboard.pointer_lookup_times = Accès pointeur
+dashboard.memory_allocate_times = Allocation mémoire
+dashboard.memory_free_times = Désallocation mémoire
+dashboard.current_heap_usage = Taille du heap actuelle
+dashboard.heap_memory_obtained = Mémoire heap obtenue
+dashboard.heap_memory_idle = Mémoire heap inactive
+dashboard.heap_memory_in_use = Mémoire heap utilisée
+dashboard.heap_memory_released = Mémoire heap relachée
+dashboard.heap_objects = Objets dans le heap
+dashboard.bootstrap_stack_usage = Bootstrap Stack Usage
+dashboard.stack_memory_obtained = Stack Memory Obtained
+dashboard.mspan_structures_usage = MSpan Structures Usage
+dashboard.mspan_structures_obtained = MSpan Structures Obtained
+dashboard.mcache_structures_usage = MCache Structures Usage
+dashboard.mcache_structures_obtained = MCache Structures Obtained
+dashboard.profiling_bucket_hash_table_obtained = Profiling Bucket Hash Table Obtained
+dashboard.gc_metadata_obtained = GC Metadada Obtained
+dashboard.other_system_allocation_obtained = Other System Allocation Obtained
+dashboard.next_gc_recycle = Next GC Recycle
+dashboard.last_gc_time = Since Last GC Time
+dashboard.total_gc_time = Total GC Pause
+dashboard.total_gc_pause = Total GC Pause
+dashboard.last_gc_pause = Last GC Pause
+dashboard.gc_times = GC Times
+
+users.user_manage_panel = Gestion des usager
+users.new_account = Creér un nouveau compte
+users.name = Nom
+users.activated = Activé
+users.admin = Gestionnaire
+users.repos = Dépôts
+users.created = Créé
+users.edit = Editer
+users.auth_source = Source d'authentification
+users.local = Locale
+users.auth_login_name = Identifiant d'authentification
+users.update_profile_success = Compte crée.
+users.edit_account = Éditer compte
+users.is_activated = Ce compte est activé
+users.is_admin = Ce compte a les droits de gestionnaire
+users.update_profile = Mettre à jour le compte
+users.delete_account = Détruire ce compte
+users.still_own_repo = Ce compte est responsables d'un dépôt. I faut détruire le dépôt ou transférer la responsabilité avant de détruire ce compte.
+
+orgs.org_manage_panel = Gestion des organisations
+orgs.name = Nom
+orgs.teams = Équipes
+orgs.members = Membres
+
+repos.repo_manage_panel = Gestion des dépôts
+repos.owner = Responsable
+repos.name = Nom
+repos.private = Privé
+repos.watches = Suivis
+repos.stars = Étoiles
+repos.issues = Ticket
+
+auths.auth_manage_panel = Gestion des sources d'authentification
+auths.new = Ajouter une nouvelle source d'authentification
+auths.name = Nom
+auths.type = Type
+auths.enabled = Activé
+auths.updated = Mis à jour
+auths.auth_type = Type d'authentification
+auths.auth_name = Nom de l'authentification
+auths.domain = Domaine
+auths.host = Serveur
+auths.port = Port
+auths.base_dn = DN de base
+auths.attributes = Attributs de recherche
+auths.filter = Filtre de recherche
+auths.ms_ad_sa = Microsoft Active Directory
+auths.smtp_auth = Authentification SMTP
+auths.smtphost = Serveur SMTP
+auths.smtpport = Port SMTP
+auths.enable_tls = Chiffrement TLS
+auths.enable_auto_register = Activer auto-abonnement
+auths.tips = Trucs
+auths.edit = Éditer réglages d'authentification
+auths.activated = Source d'authentification activée
+auths.update_success = Réglages mis à jour.
+auths.update = Mettre à jour réglages
+auths.delete = Détruire cette source
+
+config.server_config = Configuration du serveur
+config.app_name = Nom de l'applicaiton
+config.app_ver = Version de l'application
+config.app_url = URL de l'application
+config.domain = Domaine
+config.offline_mode = Mode hors-ligne
+config.disable_router_log = Journal du routeur désactivé
+config.run_user = Éxécuté en tant que
+config.run_mode = Mode de fonctionnement
+config.repo_root_path = Dossier contenant les dépôts
+config.static_file_root_path = Dossier contenant les fichiers statiques
+config.log_file_root_path = Dossier contenant les journaux
+config.script_type = Type de script
+config.reverse_auth_user = Usager d'authentification inversée
+config.db_config = Configuration de la BD
+config.db_type = Type
+config.db_host = Serveur
+config.db_name = Nom
+config.db_user = Usager
+config.db_ssl_mode = Mode SSL
+config.db_ssl_mode_helper = (pour "postgres" seulement)
+config.db_path = Path
+config.db_path_helper = (pour "sqlite3" seulement)
+config.service_config = Configuration du service
+config.register_email_confirm = Confirmation d'abonnement par courriel
+config.disable_register = Auto-inscription désactivée
+config.require_sign_in_view = Connexion requise pour visualiser
+config.mail_notify = Notifications par courriel
+config.enable_cache_avatar = Cache avatar activée
+config.active_code_lives = Jeton d'activation
+config.reset_password_code_lives = Jeton de modification mot-de-passe
+config.webhook_config = Configuration Webhook
+config.task_interval = Intervalle
+config.deliver_timeout = Expiration des appels
+config.mailer_config = Configuration expédition de courriels
+config.mailer_enabled = Activé
+config.mailer_name = Nom
+config.mailer_host = Serveur
+config.mailer_user = Usager
+config.oauth_config = Configuration OAuth
+config.oauth_enabled = Activé
+config.cache_config = Configuration du cache
+config.cache_adapter = Mécanisme de cache
+config.cache_interval = Intervalle
+config.cache_conn = Chaîne de connexion
+config.session_config = Configuration des session
+config.session_provider = Mécanisme
+config.provider_config = Configuration du mécanisme
+config.cookie_name = Nom du fichier témoin
+config.enable_set_cookie = Fichier témoin actvité
+config.gc_interval_time = Intervalle GC
+config.session_life_time = Durée de la session
+config.https_only = HTTPS exigé
+config.cookie_life_time = Expiration du fichier témoin
+config.session_hash_function = Fonction de hashage ID de session
+config.session_hash_key = Clé de hashage ID de session
+config.picture_config = Configuration des avatars
+config.picture_service = Service image
+config.disable_gravatar = Désactivé Gravatar
+config.log_config = Configuration du journal
+config.log_mode = Mode de journal
+
+monitor.cron = Cron Tasks
+monitor.name = Name
+monitor.schedule = Schedule
+monitor.next = Next Time
+monitor.previous = Previous Time
+monitor.execute_times = Execute Times
+monitor.process = Running Processes
+monitor.desc = Description
+monitor.start = Start Time
+monitor.execute_time = Execution Time
+
+[action]
+create_repo = a créé le dépôt %s
+commit_repo = a poussé sur %s à %s
+create_issue = a ouvert le ticket %s#%s
+comment_issue = a commenté sur le ticket %s#%s
+
+[tool]
+ago = auparavant
+from_now = depuis
+now = maintenant
+1s = 1 seconde %s
+1m = 1 minute %s
+1h = 1 heure %s
+1d = 1 jour %s
+1w = 1 semaine %s
+1mon = 1 mos %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 années %s
+raw_seconds = secondes
+raw_minutes = minutes
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index d498da9c10..360bf4bcc6 100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -38,6 +38,50 @@ issues = 工单管理
cancel = 取消
+[install]
+install = 安装页面
+title = 首次运行安装程序
+requite_db_desc = Gogs 允许后端数据库为 MySQL、PostgreSQL 或 SQLite3，但是 SQLite3 一般只有官方二进制发行版才支持。
+db_type = 数据库类型
+host = 数据库主机
+user = 数据库用户
+password = 数据库用户密码
+db_name = 数据库名称
+db_helper = 如果您使用 MySQL，请使用 INNODB 引擎以及 utf8_general_ci 字符集。
+ssl_mode = SSL 模式
+path = 数据库文件路径
+sqlite_helper = SQLite3 数据库的文件路径。
+general_title = 应用基本设置
+repo_path = 仓库根目录
+repo_path_helper = 所有 Git 远程仓库都将被存放于该目录。
+run_user = 运行系统用户
+run_user_helper = 该用户必须具有对仓库根目录和运行 Gogs 的操作权限。
+domain = 域名
+domain_helper = 该设置影响 SSH 克隆地址。
+app_url = 应用 URL
+app_url_helper = 该设置影响 HTTP/HTTPS 克隆地址和一些邮箱中的链接。
+email_title = 邮件服务设置（可选）
+smtp_host = SMTP 主机
+mailer_user = 发送邮箱
+mailer_password = 发送邮箱密码
+notify_title = 通知提醒设置（可选）
+register_confirm = 启用注册邮箱确认
+mail_notify = 启用邮件通知提醒
+admin_title = 管理员帐号设置
+admin_name = 管理员用户名
+admin_password = 管理员密码
+confirm_password = 确认密码
+admin_email = 管理员邮箱
+install_gogs = 立即安装
+test_git_failed = 无法识别 'git' 命令：%v
+sqlite3_not_available = 您所使用的发行版不支持 SQLite3，请从 http://gogs.io/docs/installation/install_from_binary.html 下载官方二进制发行版，而不是 gobuild 版本。
+invalid_db_setting = 数据库设置不正确：%v
+invalid_repo_path = 仓库根目录设置不正确：%v
+run_user_not_match = 运行系统用户非当前用户：%s -> %s
+save_config_failed = 应用配置保存失败：%v
+invalid_admin_setting = 管理员帐户设置不正确：%v
+install_success = 您好！我们很高兴您选择使用 Gogs，祝您使用愉快，代码从此无 BUG！
+
[home]
uname_holder = 用户名或邮箱
password_holder = 密码
@@ -47,6 +91,9 @@ collaborative_repos = 参与协作的仓库
my_orgs = 我的组织
my_mirrors = 我的镜像
+[explore]
+repos = 探索仓库
+
[auth]
create_new_account = 创建帐户
register_hepler_msg = 已经注册？立即登录！
@@ -81,6 +128,7 @@ HttpsUrl = HTTPS URL 地址
PayloadUrl = 推送地址
TeamName = 团队名称
AuthName = 认证名称
+AdminEmail = 管理员邮箱
require_error = 不能为空。
alpha_dash_error = 必须为英文字母、阿拉伯数字或横线（-_）。
@@ -118,6 +166,15 @@ org_still_own_repo = 该组织仍然是某些仓库的拥有者，您必须先
still_own_user = 该授权认证依旧被部分用户使用，请先删除该部分用户后再试！
+[user]
+change_avatar = 到 gravatar.com 上修改您的头像
+join_on = 加入于
+repositories = 仓库列表
+activity = 公开活动
+followers = 关注者
+starred = 已点赞
+following = 关注中
+
[settings]
profile = 个人信息
password = 修改密码
@@ -125,6 +182,7 @@ ssh_keys = 管理 SSH 密钥
social = 社交帐号绑定
orgs = 管理组织
delete = 删除帐户
+uid = 用户 ID
public_profile = 公开信息
profile_desc = 您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。
@@ -133,6 +191,10 @@ website = 个人网站
location = 所在地区
update_profile = 更新信息
update_profile_success = 您的个人信息更新成功！
+change_username = 用户名将被修改
+change_username_desc = 用户名被修改，您确定要继续操作吗？这将会影响到所有与您帐户有关的链接。
+continue = 继续操作
+cancel = 取消操作
change_password = 修改密码
old_password = 当前密码
@@ -161,6 +223,8 @@ unbind_success = 社交帐号解除绑定成功！
delete_account = 删除当前帐户
delete_prompt = 删除操作会永久清除您的帐户信息，并且 不可恢复！
confirm_delete_account = 确认删除帐户
+delete_account_title = 帐户删除操作
+delete_account_desc = 该帐户将被永久性删除，您确定要继续操作吗？
[repo]
owner = 拥有者
@@ -185,6 +249,9 @@ migrate_type = 迁移类型
migrate_type_helper = 本仓库将是 镜像
migrate_repo = 迁移仓库
+copy_link = 复制链接
+click_to_copy = 复制到剪切板
+copied = 复制成功
clone_helper = 不知道如何操作？访问 此处 查看帮助！
unwatch = 取消关注
watch = 关注
@@ -192,6 +259,30 @@ unstar = 取消点赞
star = 点赞
fork = 派生
+no_desc = 暂无描述
+quick_guide = 快速帮助
+clone_this_repo = 克隆当前仓库
+create_new_repo_command = 从命令行创建一个新的仓库
+push_exist_repo = 从命令行推送已经创建的仓库
+
+branch = 分支
+tree = 目录树
+branch_and_tags = 分支与标签
+branches = 分支列表
+tags = 标签列表
+issues = 工单管理
+commits = 提交历史
+releases = 版本发布
+
+commits.commits = 次代码提交
+commits.search = 搜索提交历史
+commits.find = 查找
+commits.author = 作者
+commits.message = 备注
+commits.date = 提交日期
+commits.older = 更旧的提交
+commits.newer = 更新的提交
+
settings = 仓库设置
settings.options = 基本设置
settings.collaboration = 管理协作者
@@ -201,13 +292,18 @@ settings.basic_settings = 基本设置
settings.danger_zone = 危险操作区
settings.site = 官方网站
settings.update_settings = 更新仓库设置
+settings.change_reponame = 仓库名称将被修改
+settings.change_reponame_desc = 仓库名称被修改，您确定要继续操作吗？这将会影响到所有与该仓库有关的链接。
settings.transfer = 转移仓库所有权
settings.transfer_desc = 您可以将仓库转移至您拥有管理员权限的帐户或组织。
+settings.new_owner_has_same_repo = 新的仓库拥有者已经存在同名仓库！
settings.delete = 删除本仓库
settings.delete_desc = 删除仓库操作不可逆转，请三思而后行。
+settings.transfer_notices =
- 如果您转移给个人用户，您将对仓库失去所有权限。
- 如果您转移给您作为拥有者的组织，则可继续保持操作权限。
settings.update_settings_success = 仓库设置更新成功！
settings.transfer_owner = 新拥有者
settings.make_transfer = 确认转移仓库
+settings.transfer_succeed = 仓库所有权转移成功！
settings.confirm_delete = 确认删除仓库
settings.add_collaborator = 增加新的协作者
settings.add_collaborator_success = 成功添加新的协作者！
@@ -228,6 +324,11 @@ settings.update_webhook = 更新 Web 钩子
settings.update_hook_success = Web 钩子更新成功！
settings.delete_webhook = 删除 Web 钩子
settings.recent_deliveries = 最近推送记录
+settings.hook_type = 钩子类型
+settings.add_slack_hook_desc = 为您的仓库增加 Slack 集成
+settings.slack_token = 令牌
+settings.slack_domain = 域名
+settings.slack_channel = 频道
[org]
org_name_holder = 组织名称
@@ -254,11 +355,16 @@ settings.full_name = 组织全名
settings.website = 官方网站
settings.location = 所在地区
settings.update_settings = 更新组织设置
+settings.change_orgname = 组织名称将被修改
+settings.change_orgname_desc = 组织名称被修改，您确定要继续操作吗？这将会影响到所有与该组织有关的链接。
settings.update_setting_success = 组织设置更新成功！
settings.delete = 删除组织
settings.delete_account = 删除当前组织
settings.delete_prompt = 删除操作会永久清除该组织的信息，并且 不可恢复！
settings.confirm_delete_account = 确认删除组织
+settings.delete_org_title = 组织删除操作
+settings.delete_org_desc = 该组织将被永久性删除，您确定要继续操作吗？
+settings.hooks_desc = 在此处添加的 Web 钩子将会应用到该组织下的 所有仓库。
members.public = 公开成员
members.public_helper = 设为私有
@@ -287,6 +393,8 @@ teams.members = 团队成员
teams.update_settings = 更新团队设置
teams.delete_team = 删除当前团队
teams.add_team_member = 添加团队成员
+teams.delete_team_title = 团队删除操作
+teams.delete_team_desc = 删除操作会永久清除有关该团队的信息，您确定要继续操作吗？团队成员可能会失去对某些仓库的操作权限。
teams.delete_team_success = 指定团队删除成功！
teams.read_permission_desc = 该团队拥有对所属仓库的 读取 权限，团队成员可以进行查看和克隆等只读操作。
teams.write_permission_desc = 该团队拥有对所属仓库的 读取 和 写入 的权限。
@@ -362,6 +470,7 @@ users.is_activated = 该用户已被激活
users.is_admin = 该用户具有管理员权限
users.update_profile = 更新用户信息
users.delete_account = 删除该用户
+users.still_own_repo = 该帐户仍然是某些仓库的拥有者，您必须先转移或删除它们才能执行删除帐户操作！
orgs.org_manage_panel = 组织管理面板
orgs.name = 组织名称
@@ -402,6 +511,8 @@ auths.activated = 该授权认证已经启用
auths.update_success = 授权认证设置更新成功！
auths.update = 更新授权认证信息
auths.delete = 删除该授权认证
+auths.delete_auth_title = 授权认证删除操作
+auths.delete_auth_desc = 该授权认证将被删除，您确定要继续吗？
config.server_config = 服务器配置
config.app_name = 应用名称
@@ -477,10 +588,11 @@ monitor.start = 开始时间
monitor.execute_time = 已执行时间
[action]
-create_repo = 创建了仓库 %s
-commit_repo = 推送了 %s 分支的代码到 %s
-create_issue = 创建了工单 %s#%s
-comment_issue = 评论了工单 %s#%s
+create_repo = 创建了仓库 %s
+commit_repo = 推送了 %s 分支的代码到 %s
+create_issue = 创建了工单 %s#%s
+comment_issue = 评论了工单 %s#%s
+transfer_repo = 将仓库 %s 转移至 %s
[tool]
ago = 之前
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000000..448912009c
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,89 @@
+Docker
+======
+
+TOOLS ARE WRITTEN FOR TESTING AND TO SEE WHAT IT IS!
+
+For this to work you will need the nifty docker tool [fig].
+
+The most simple setup will look like this:
+
+```sh
+./assemble_blocks.sh docker_gogs w_db option_db_mysql
+fig up
+
+```
+
+That's it. You have GoGS running in docker linked to a MySQL docker container.
+
+Now visit http://localhost:3000/ and give details for the admin account an you're up and running.
+
+
+How does it work
+----------------
+
+`./assemble_blocks.sh` will look in `blocks` for subdirectories.
+In the subdirectories there are three relevant files: `Dockerfile`, `config` and `fig`.
+
+`Dockerfile` will be copied to `docker/` (also means last `Dockerfile` wins).
+
+The `config` file contains lines which will in the gogs docker container end up in `$GOGS_PATH/custom/config/app.ini` and by this gogs will be configured.
+Here you can define things like the MySQL server for your database block.
+
+The `fig` file will just be added to `fig.yml`, which is used by fig to manage your containers.
+This inculdes container linking!
+
+Just have a look at them and it will be clear how to write your own blocks.
+
+Just some things
+
+ - all files (`Dockerfile`, `fig` and `config`) are optional
+ - the gogs block should always be the first block
+
+Currently the blocks are designed that, the blocks that start with `docker` pull in the base docker image.
+Then one block starting with `w` defines, what containers should be linked to the gogs container.
+For every option in the `w` block you need to add an `option` container.
+
+Example:
+
+```sh
+./assemble_blocks.sh docker_gogs w_db_cache option_db_mysql option_cache_redis
+```
+
+
+More sophisticated Example
+--------------------------
+
+Her is a more elaborated example
+
+```sh
+./assemble_blocks.sh docker_gogs w_db_cache_session option_db_postgresql option_cache_redis option_session_mysql
+fig up
+```
+
+This will set up four containters and link them proberly. One for each of
+
+ - gogs
+ - database (postgresql)
+ - cache (redis)
+ - session (mysql)
+
+WARNING: This will not work at the Moment! MySQL session is broken!
+
+
+Remark
+------
+
+After you execute `assemble_blocks.sh` you should always trigger `fig build` to inculde the the new init script `init_gogs.sh` in the docker image.
+
+If you want to use another GoGS docker file, but keep everything else the same, you can create a block, e.g. `docker_gogs_custom`, with only a `Dockerfile` and call
+
+```sh
+./assemble_blocks.sh docker_gogs_custom w_db option_database_mysql
+```
+
+This will pull in the `Dockerfile` from `docker_gogs` instead of the one from `docker_gogs`.
+
+`Dockerfile`s for the `master` and `dev` branch are provided as `docker_gogs` and `docker_gogs_dev`
+
+
+[fig]:http://www.fig.sh/
\ No newline at end of file
diff --git a/docker/assemble_blocks.sh b/docker/assemble_blocks.sh
new file mode 100755
index 0000000000..852064de28
--- /dev/null
+++ b/docker/assemble_blocks.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+blocks_dir=blocks
+docker_dir=docker
+template_dir=templates
+
+docker_file=Dockerfile
+
+gogs_config_file=conf.tmp
+gogs_config=config
+gogs_init_file=$docker_dir/init_gogs.sh
+
+fig_file=fig.yml
+fig_config=fig
+
+gogs_init_template=$template_dir/init_gogs.sh.tpl
+
+if [ "$#" == 0 ]; then
+ blocks=`ls $blocks_dir`
+ if [ -z "$blocks" ]; then
+ echo "No Blocks available in $blocks_dir"
+ else
+ echo "Available Blocks:"
+ for block in $blocks; do
+ echo " $block"
+ done
+ fi
+ exit 0
+fi
+
+for file in $gogs_config_file $fig_file; do
+ if [ -e $file ]; then
+ echo "Deleting $file"
+ rm $file
+ fi
+done
+
+for dir in $@; do
+ current_dir=$blocks_dir/$dir
+ if [ ! -d "$current_dir" ]; then
+ echo "$current_dir is not a directory"
+ exit 1
+ fi
+
+ if [ -e $current_dir/$docker_file ]; then
+ echo "Copying $current_dir/$docker_file to $docker_dir/$docker_file"
+ cp $current_dir/$docker_file $docker_dir/$docker_file
+ fi
+
+ if [ -e $current_dir/$gogs_config ]; then
+ echo "Adding $current_dir/$gogs_config to $gogs_config_file"
+ cat $current_dir/$gogs_config >> $gogs_config_file
+ echo "" >> $gogs_config_file
+ fi
+
+ if [ -e $current_dir/$fig_config ]; then
+ echo "Adding $current_dir/$fig_config to $fig_file"
+ cat $current_dir/fig >> $fig_file
+ echo "" >> $fig_file
+ fi
+done
+
+echo "Creating $gogs_init_file"
+sed "/{{ CONFIG }}/{
+r $gogs_config_file
+d
+}" $gogs_init_template > $gogs_init_file
+
+if [ -e $gogs_config_file ]; then
+ echo "Removing temporary GoGS config"
+ rm $gogs_config_file
+fi
\ No newline at end of file
diff --git a/docker/blocks/docker_gogs/Dockerfile b/docker/blocks/docker_gogs/Dockerfile
new file mode 100644
index 0000000000..e2e056ae02
--- /dev/null
+++ b/docker/blocks/docker_gogs/Dockerfile
@@ -0,0 +1,52 @@
+FROM ubuntu:14.04
+
+# This part is taken from the official docker image --------------------
+
+RUN apt-get update && apt-get install -y \
+ build-essential ca-certificates curl \
+ bzr git mercurial \
+ --no-install-recommends
+
+ENV GOLANG_VERSION 1.3
+
+RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
+ | tar -v -C /usr/src -xz
+WORKDIR /usr/src/go
+
+RUN cd src && ./make.bash --no-clean 2>&1
+
+ENV PATH /usr/src/go/bin:$PATH
+
+RUN mkdir -p /go/src
+ENV GOPATH /go
+ENV PATH /go/bin:$PATH
+WORKDIR /go
+
+# ----------------------------------------------------------------------
+
+
+RUN useradd -m git
+
+ENV GOGS_PATH $GOPATH/src/github.com/gogits/gogs
+ENV GOGS_CUSTOM_CONF_PATH $GOGS_PATH/custom/conf
+ENV GOGS_CUSTOM_CONF $GOGS_CUSTOM_CONF_PATH/app.ini
+
+RUN go get -u -d github.com/gogits/gogs
+# WORKDIR $GOGS_PATH
+WORKDIR /go/src/github.com/gogits/gogs
+RUN go build github.com/gogits/gogs
+RUN chown -R git $GOGS_PATH
+
+ADD init_gogs.sh /tmp/
+RUN chown git /tmp/init_gogs.sh
+RUN chmod +x /tmp/init_gogs.sh
+
+USER git
+ENV HOME /home/git
+ENV USER git
+ENV PATH $GOGS_PATH:$PATH
+
+RUN git config --global user.name "GoGS"
+
+ENTRYPOINT ["/tmp/init_gogs.sh"]
+CMD ["gogs", "web"]
diff --git a/docker/blocks/docker_gogs_dev/Dockerfile b/docker/blocks/docker_gogs_dev/Dockerfile
new file mode 100644
index 0000000000..d1b96bf4a2
--- /dev/null
+++ b/docker/blocks/docker_gogs_dev/Dockerfile
@@ -0,0 +1,53 @@
+FROM ubuntu:14.04
+
+# This part is derived from the official docker image ------------------
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+ apt-get install -qy \
+ build-essential ca-certificates curl \
+ bzr git mercurial \
+ --no-install-recommends
+
+ENV GOLANG_VERSION 1.3
+
+RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
+ | tar -v -C /usr/src -xz
+WORKDIR /usr/src/go
+
+RUN cd src && ./make.bash --no-clean 2>&1
+
+ENV PATH /usr/src/go/bin:$PATH
+
+RUN mkdir -p /go/src
+ENV GOPATH /go
+ENV PATH /go/bin:$PATH
+WORKDIR /go
+
+# ----------------------------------------------------------------------
+
+
+RUN useradd -m git
+
+ENV GOGS_PATH $GOPATH/src/github.com/gogits/gogs
+ENV GOGS_CUSTOM_CONF_PATH $GOGS_PATH/custom/conf
+ENV GOGS_CUSTOM_CONF $GOGS_CUSTOM_CONF_PATH/app.ini
+
+RUN git clone -b dev https://github.com/gogits/gogs.git $GOGS_PATH
+# WORKDIR $GOGS_PATH
+WORKDIR /go/src/github.com/gogits/gogs
+RUN go get -d && go build
+RUN chown -R git $GOGS_PATH
+
+ADD init_gogs.sh /tmp/
+RUN chown git /tmp/init_gogs.sh
+RUN chmod +x /tmp/init_gogs.sh
+
+USER git
+ENV HOME /home/git
+ENV USER git
+ENV PATH $GOGS_PATH:$PATH
+
+RUN git config --global user.name "GoGS"
+
+ENTRYPOINT ["/tmp/init_gogs.sh"]
+CMD ["gogs", "web"]
diff --git a/docker/blocks/option_cache_memcache/config b/docker/blocks/option_cache_memcache/config
new file mode 100644
index 0000000000..daca6f3ef9
--- /dev/null
+++ b/docker/blocks/option_cache_memcache/config
@@ -0,0 +1,3 @@
+[cache]
+DB_TYPE = memcache
+HOST = HOST = ${CACHE_1_PORT_11211_TCP_ADDR}:${CACHE_1_PORT_11211_TCP_PORT}
diff --git a/docker/blocks/option_cache_memcache/fig b/docker/blocks/option_cache_memcache/fig
new file mode 100644
index 0000000000..80d0215cc7
--- /dev/null
+++ b/docker/blocks/option_cache_memcache/fig
@@ -0,0 +1,2 @@
+cache:
+ image: sylvainlasnier/memcached:latest
diff --git a/docker/blocks/option_cache_redis/config b/docker/blocks/option_cache_redis/config
new file mode 100644
index 0000000000..648f4f3802
--- /dev/null
+++ b/docker/blocks/option_cache_redis/config
@@ -0,0 +1,3 @@
+[cache]
+DB_TYPE = redis
+HOST = ${CACHE_1_PORT_6379_TCP_ADDR}:${CACHE_1_PORT_6379_TCP_PORT}
diff --git a/docker/blocks/option_cache_redis/fig b/docker/blocks/option_cache_redis/fig
new file mode 100644
index 0000000000..0e74bc4aef
--- /dev/null
+++ b/docker/blocks/option_cache_redis/fig
@@ -0,0 +1,2 @@
+cache:
+ image: redis:latest
diff --git a/docker/blocks/option_db_mysql/config b/docker/blocks/option_db_mysql/config
new file mode 100644
index 0000000000..53f8949d9b
--- /dev/null
+++ b/docker/blocks/option_db_mysql/config
@@ -0,0 +1,6 @@
+[database]
+DB_TYPE = mysql
+HOST = ${DB_1_PORT_3306_TCP_ADDR}:${DB_1_PORT_3306_TCP_PORT}
+NAME = ${DB_1_ENV_MYSQL_DATABASE}
+USER = ${DB_1_ENV_MYSQL_USER}
+PASSWD = ${DB_1_ENV_MYSQL_PASSWORD}
diff --git a/docker/blocks/option_db_mysql/fig b/docker/blocks/option_db_mysql/fig
new file mode 100644
index 0000000000..a005a0593c
--- /dev/null
+++ b/docker/blocks/option_db_mysql/fig
@@ -0,0 +1,7 @@
+db:
+ image: mysql:latest
+ environment:
+ MYSQL_ROOT_PASSWORD: rootpass
+ MYSQL_DATABASE: gogs
+ MYSQL_USER: gogs
+ MYSQL_PASSWORD: password
diff --git a/docker/blocks/option_db_postgresql/config b/docker/blocks/option_db_postgresql/config
new file mode 100644
index 0000000000..e5946b06db
--- /dev/null
+++ b/docker/blocks/option_db_postgresql/config
@@ -0,0 +1,6 @@
+[database]
+DB_TYPE = postgres
+HOST = ${DB_1_PORT_5432_TCP_ADDR}:${DB_1_PORT_5432_TCP_PORT}
+NAME = ${DB_1_ENV_POSTGRESQL_DB}
+USER = ${DB_1_ENV_POSTGRESQL_USER}
+PASSWD = ${DB_1_ENV_POSTGRESQL_PASS}
diff --git a/docker/blocks/option_db_postgresql/fig b/docker/blocks/option_db_postgresql/fig
new file mode 100644
index 0000000000..c839e90448
--- /dev/null
+++ b/docker/blocks/option_db_postgresql/fig
@@ -0,0 +1,6 @@
+db:
+ image: wyaeld/postgres:9.3
+ environment:
+ POSTGRESQL_DB: gogs
+ POSTGRESQL_USER: gogs
+ POSTGRESQL_PASS: password
diff --git a/docker/blocks/option_session_mysql/config b/docker/blocks/option_session_mysql/config
new file mode 100644
index 0000000000..b8bc2cc703
--- /dev/null
+++ b/docker/blocks/option_session_mysql/config
@@ -0,0 +1,3 @@
+[session]
+PROVIDER = mysql
+PROVIDER_CONFIG = ${SESSION_1_ENV_MYSQL_USER}:${SESSION_1_ENV_MYSQL_PASSWORD}@SESSION_1_PORT_3306_TCP_PROTO(${SESSION_1_PORT_3306_TCP_ADDR}:${SESSION_1_PORT_3306_TCP_PORT})/${SESSION_1_ENV_MYSQL_DATABASE}
diff --git a/docker/blocks/option_session_mysql/fig b/docker/blocks/option_session_mysql/fig
new file mode 100644
index 0000000000..0e2dbf19c9
--- /dev/null
+++ b/docker/blocks/option_session_mysql/fig
@@ -0,0 +1,7 @@
+session:
+ image: mysql:latest
+ environment:
+ MYSQL_ROOT_PASSWORD: rootpass
+ MYSQL_DATABASE: gogs_session
+ MYSQL_USER: gogs
+ MYSQL_PASSWORD: password
diff --git a/docker/blocks/w_cache/fig b/docker/blocks/w_cache/fig
new file mode 100644
index 0000000000..fd66c35786
--- /dev/null
+++ b/docker/blocks/w_cache/fig
@@ -0,0 +1,6 @@
+gogs:
+ build: docker
+ links:
+ - cache
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_cache_session/fig b/docker/blocks/w_cache_session/fig
new file mode 100644
index 0000000000..0f90114064
--- /dev/null
+++ b/docker/blocks/w_cache_session/fig
@@ -0,0 +1,7 @@
+gogs:
+ build: docker
+ links:
+ - cache
+ - session
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_db/fig b/docker/blocks/w_db/fig
new file mode 100644
index 0000000000..a7e9c1b69a
--- /dev/null
+++ b/docker/blocks/w_db/fig
@@ -0,0 +1,6 @@
+gogs:
+ build: docker
+ links:
+ - db
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_db_cache/fig b/docker/blocks/w_db_cache/fig
new file mode 100644
index 0000000000..42402e40f3
--- /dev/null
+++ b/docker/blocks/w_db_cache/fig
@@ -0,0 +1,7 @@
+gogs:
+ build: docker
+ links:
+ - db
+ - cache
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_db_cache_session/fig b/docker/blocks/w_db_cache_session/fig
new file mode 100644
index 0000000000..42444405af
--- /dev/null
+++ b/docker/blocks/w_db_cache_session/fig
@@ -0,0 +1,8 @@
+gogs:
+ build: docker
+ links:
+ - db
+ - cache
+ - session
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_db_session/fig b/docker/blocks/w_db_session/fig
new file mode 100644
index 0000000000..3703c6ba33
--- /dev/null
+++ b/docker/blocks/w_db_session/fig
@@ -0,0 +1,7 @@
+gogs:
+ build: docker
+ links:
+ - db
+ - session
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_none/fig b/docker/blocks/w_none/fig
new file mode 100644
index 0000000000..c0fed209d6
--- /dev/null
+++ b/docker/blocks/w_none/fig
@@ -0,0 +1,4 @@
+gogs:
+ build: docker
+ ports:
+ - "3000:3000"
diff --git a/docker/blocks/w_session/fig b/docker/blocks/w_session/fig
new file mode 100644
index 0000000000..7dda0dde92
--- /dev/null
+++ b/docker/blocks/w_session/fig
@@ -0,0 +1,6 @@
+gogs:
+ build: docker
+ links:
+ - session
+ ports:
+ - "3000:3000"
diff --git a/scripts/dockerfiles/images/memcache/.gitkeep b/docker/docker/.gitkeep
similarity index 100%
rename from scripts/dockerfiles/images/memcache/.gitkeep
rename to docker/docker/.gitkeep
diff --git a/docker/templates/init_gogs.sh.tpl b/docker/templates/init_gogs.sh.tpl
new file mode 100644
index 0000000000..26cff4e501
--- /dev/null
+++ b/docker/templates/init_gogs.sh.tpl
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ ! -d "$DIRECTORY" ]; then
+ mkdir -p $GOGS_CUSTOM_CONF_PATH
+
+echo "
+{{ CONFIG }}
+" >> $GOGS_CUSTOM_CONF
+
+fi
+
+exec "$@"
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
deleted file mode 100644
index 11d28d0fcb..0000000000
--- a/dockerfiles/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-### Install Gogs With Docker
-
-Deploying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the configs:
-
-```
-DB_TYPE="YOUR_DB_TYPE" # type of database, support 'mysql' and 'postgres'
-MEM_TYPE="YOUR_MEM_TYPE" # type of memory database, support 'redis' and 'memcache'
-DB_PASSWORD="YOUR_DB_PASSWORD" # The database password.
-DB_RUN_NAME="YOUR_DB_RUN_NAME" # The --name option value when run the database image.
-MEM_RUN_NAME="YOUR_MEM_RUN_NAME" # The --name option value when run the mem database image.
-HOST_PORT="YOUR_HOST_PORT" # The port on host, which will be redirected to the port 3000 inside gogs container.
-```
-
-And run:
-```
-cd dockerfiles
-./build.sh
-```
-
-The build might take some time, just be patient. After it finishes, you will receive the message:
-
-```
-Now we have the MySQL image(running) and gogs image, use the follow command to start gogs service( the content might be different, according to your own configs):
- docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs
-```
-
-Just follow the message, run:
-
-```
- docker run -i -t --link YOUR_DB_RUN_NAME:db --link YOUR_MEM_RUN_NAME:mem -p YOUR_HOST_PORT:3000 gogits/gogs
-```
-
-Now we have gogs running! Open the browser and navigate to:
-
-```
-http://YOUR_HOST_IP:YOUR_HOST_PORT
-```
-
-Let's 'gogs'!
-Ouya~
diff --git a/gogs.go b/gogs.go
index 1e2150b3c3..289ad19123 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.4.9.0831 Beta"
+const APP_VER = "0.5.4.1003 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
@@ -35,6 +35,7 @@ func main() {
cmd.CmdUpdate,
cmd.CmdFix,
cmd.CmdDump,
+ cmd.CmdCert,
}
app.Flags = append(app.Flags, []cli.Flag{}...)
app.Run(os.Args)
diff --git a/models/action.go b/models/action.go
index b5f692c49f..4203ead38e 100644
--- a/models/action.go
+++ b/models/action.go
@@ -137,7 +137,7 @@ func updateIssuesCommit(userId, repoId int64, repoUserName, repoName string, com
return err
}
- url := fmt.Sprintf("/%s/%s/commit/%s", repoUserName, repoName, c.Sha1)
+ url := fmt.Sprintf("%s/%s/%s/commit/%s", setting.AppSubUrl, repoUserName, repoName, c.Sha1)
message := fmt.Sprintf(`%s`, url, c.Message)
if _, err = CreateComment(userId, issue.RepoId, issue.Id, 0, 0, COMMIT, message, nil); err != nil {
@@ -172,7 +172,7 @@ func updateIssuesCommit(userId, repoId int64, repoUserName, repoName string, com
// CommitRepoAction adds new action for committing repository.
func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
- repoId int64, repoUserName, repoName string, refFullName string, commit *base.PushCommits) error {
+ repoId int64, repoUserName, repoName string, refFullName string, commit *base.PushCommits, oldCommitId string, newCommitId string) error {
opType := COMMIT_REPO
// Check it's tag push or branch.
@@ -220,21 +220,52 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
ws, err := GetActiveWebhooksByRepoId(repoId)
if err != nil {
- return errors.New("action.CommitRepoAction(GetWebhooksByRepoId): " + err.Error())
- } else if len(ws) == 0 {
+ return errors.New("action.CommitRepoAction(GetActiveWebhooksByRepoId): " + err.Error())
+ }
+
+ // check if repo belongs to org and append additional webhooks
+ if repo.Owner.IsOrganization() {
+ // get hooks for org
+ orgws, err := GetActiveWebhooksByOrgId(repo.OwnerId)
+ if err != nil {
+ return errors.New("action.CommitRepoAction(GetActiveWebhooksByOrgId): " + err.Error())
+ }
+ ws = append(ws, orgws...)
+ }
+
+ if len(ws) == 0 {
return nil
}
repoLink := fmt.Sprintf("%s%s/%s", setting.AppUrl, repoUserName, repoName)
+ compareUrl := ""
+ // if not the first commit, set the compareUrl
+ if !strings.HasPrefix(oldCommitId, "0000000") {
+ compareUrl = fmt.Sprintf("%s/compare/%s...%s", repoLink, oldCommitId, newCommitId)
+ }
+
+ pusher_email, pusher_name := "", ""
+ pusher, err := GetUserByName(userName)
+ if err == nil {
+ pusher_email = pusher.Email
+ pusher_name = pusher.GetFullNameFallback()
+ }
+
commits := make([]*PayloadCommit, len(commit.Commits))
for i, cmt := range commit.Commits {
+ author_username := ""
+ author, err := GetUserByEmail(cmt.AuthorEmail)
+ if err == nil {
+ author_username = author.Name
+ }
commits[i] = &PayloadCommit{
Id: cmt.Sha1,
Message: cmt.Message,
Url: fmt.Sprintf("%s/commit/%s", repoLink, cmt.Sha1),
Author: &PayloadAuthor{
- Name: cmt.AuthorName,
- Email: cmt.AuthorEmail,
+ Name: cmt.AuthorName,
+ Email: cmt.AuthorEmail,
+ UserName: author_username,
},
}
}
@@ -249,15 +280,20 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
Website: repo.Website,
Watchers: repo.NumWatches,
Owner: &PayloadAuthor{
- Name: repoUserName,
- Email: actEmail,
+ Name: repo.Owner.GetFullNameFallback(),
+ Email: repo.Owner.Email,
+ UserName: repo.Owner.Name,
},
Private: repo.IsPrivate,
},
Pusher: &PayloadAuthor{
- Name: repo.Owner.LowerName,
- Email: repo.Owner.Email,
+ Name: pusher_name,
+ Email: pusher_email,
+ UserName: userName,
},
+ Before: oldCommitId,
+ After: newCommitId,
+ CompareUrl: compareUrl,
}
for _, w := range ws {
@@ -266,15 +302,36 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
continue
}
- p.Secret = w.Secret
- CreateHookTask(&HookTask{
- Type: WEBHOOK,
- Url: w.Url,
- Payload: p,
- ContentType: w.ContentType,
- IsSsl: w.IsSsl,
- })
+ switch w.HookTaskType {
+ case SLACK:
+ {
+ s, err := GetSlackPayload(p, w.Meta)
+ if err != nil {
+ return errors.New("action.GetSlackPayload: " + err.Error())
+ }
+ CreateHookTask(&HookTask{
+ Type: w.HookTaskType,
+ Url: w.Url,
+ BasePayload: s,
+ ContentType: w.ContentType,
+ IsSsl: w.IsSsl,
+ })
+ }
+ default:
+ {
+ p.Secret = w.Secret
+ CreateHookTask(&HookTask{
+ Type: w.HookTaskType,
+ Url: w.Url,
+ BasePayload: p,
+ ContentType: w.ContentType,
+ IsSsl: w.IsSsl,
+ })
+ }
+ }
}
+
+ go DeliverHooks()
return nil
}
@@ -293,13 +350,29 @@ func NewRepoAction(u *User, repo *Repository) (err error) {
// TransferRepoAction adds new action for transfering repository.
func TransferRepoAction(u, newUser *User, repo *Repository) (err error) {
- if err = NotifyWatchers(&Action{ActUserId: u.Id, ActUserName: u.Name, ActEmail: u.Email,
- OpType: TRANSFER_REPO, RepoId: repo.Id, RepoName: repo.Name, Content: newUser.Name,
- IsPrivate: repo.IsPrivate}); err != nil {
+ action := &Action{
+ ActUserId: u.Id,
+ ActUserName: u.Name,
+ ActEmail: u.Email,
+ OpType: TRANSFER_REPO,
+ RepoId: repo.Id,
+ RepoUserName: newUser.Name,
+ RepoName: repo.Name,
+ IsPrivate: repo.IsPrivate,
+ Content: path.Join(repo.Owner.LowerName, repo.LowerName),
+ }
+ if err = NotifyWatchers(action); err != nil {
log.Error(4, "NotifyWatchers: %d/%s", u.Id, repo.Name)
return err
}
+ // Remove watch for organization.
+ if repo.Owner.IsOrganization() {
+ if err = WatchRepo(repo.Owner.Id, repo.Id, false); err != nil {
+ log.Error(4, "WatchRepo", err)
+ }
+ }
+
log.Trace("action.TransferRepoAction: %s/%s", u.Name, repo.Name)
return err
}
@@ -309,7 +382,7 @@ func GetFeeds(uid, offset int64, isProfile bool) ([]*Action, error) {
actions := make([]*Action, 0, 20)
sess := x.Limit(20, int(offset)).Desc("id").Where("user_id=?", uid)
if isProfile {
- sess.Where("is_private=?", false).And("act_user_id=?", uid)
+ sess.And("is_private=?", false).And("act_user_id=?", uid)
}
err := sess.Find(&actions)
return actions, err
diff --git a/models/git_diff.go b/models/git_diff.go
index 4b4d1234dd..e093e7ab1b 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -15,8 +15,7 @@ import (
"github.com/Unknwon/com"
- "github.com/gogits/git"
-
+ "github.com/gogits/gogs/modules/git"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
)
@@ -71,7 +70,7 @@ func (diff *Diff) NumFiles() int {
const DIFF_HEAD = "diff --git "
-func ParsePatch(pid int64, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
+func ParsePatch(pid int64, maxlines int, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
scanner := bufio.NewScanner(reader)
var (
curFile *DiffFile
@@ -80,6 +79,7 @@ func ParsePatch(pid int64, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
}
leftLine, rightLine int
+ isTooLong bool
)
diff := &Diff{Files: make([]*DiffFile, 0)}
@@ -91,18 +91,19 @@ func ParsePatch(pid int64, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
continue
}
- i = i + 1
-
- // Diff data too large.
- if i == 5000 {
- log.Warn("Diff data too large")
- return &Diff{}, nil
- }
-
if line == "" {
continue
}
+ i = i + 1
+
+ // Diff data too large, we only show the first about maxlines lines
+ if i == maxlines {
+ isTooLong = true
+ log.Warn("Diff data too large")
+ //return &Diff{}, nil
+ }
+
switch {
case line[0] == ' ':
diffLine := &DiffLine{Type: DIFF_LINE_PLAIN, Content: line, LeftIdx: leftLine, RightIdx: rightLine}
@@ -111,6 +112,10 @@ func ParsePatch(pid int64, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
curSection.Lines = append(curSection.Lines, diffLine)
continue
case line[0] == '@':
+ if isTooLong {
+ return diff, nil
+ }
+
curSection = &DiffSection{}
curFile.Sections = append(curFile.Sections, curSection)
ss := strings.Split(line, "@@")
@@ -144,6 +149,10 @@ func ParsePatch(pid int64, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
// Get new file.
if strings.HasPrefix(line, DIFF_HEAD) {
+ if isTooLong {
+ return diff, nil
+ }
+
fs := strings.Split(line[len(DIFF_HEAD):], " ")
a := fs[0]
@@ -175,25 +184,30 @@ func ParsePatch(pid int64, cmd *exec.Cmd, reader io.Reader) (*Diff, error) {
return diff, nil
}
-func GetDiff(repoPath, commitid string) (*Diff, error) {
+func GetDiffRange(repoPath, beforeCommitId string, afterCommitId string, maxlines int) (*Diff, error) {
repo, err := git.OpenRepository(repoPath)
if err != nil {
return nil, err
}
- commit, err := repo.GetCommit(commitid)
+ commit, err := repo.GetCommit(afterCommitId)
if err != nil {
return nil, err
}
rd, wr := io.Pipe()
var cmd *exec.Cmd
- // First commit of repository.
- if commit.ParentCount() == 0 {
- cmd = exec.Command("git", "show", commitid)
+ // if "after" commit given
+ if beforeCommitId == "" {
+ // First commit of repository.
+ if commit.ParentCount() == 0 {
+ cmd = exec.Command("git", "show", afterCommitId)
+ } else {
+ c, _ := commit.Parent(0)
+ cmd = exec.Command("git", "diff", c.Id.String(), afterCommitId)
+ }
} else {
- c, _ := commit.Parent(0)
- cmd = exec.Command("git", "diff", c.Id.String(), commitid)
+ cmd = exec.Command("git", "diff", beforeCommitId, afterCommitId)
}
cmd.Dir = repoPath
cmd.Stdout = wr
@@ -208,7 +222,7 @@ func GetDiff(repoPath, commitid string) (*Diff, error) {
}()
defer rd.Close()
- desc := fmt.Sprintf("GetDiff(%s)", repoPath)
+ desc := fmt.Sprintf("GetDiffRange(%s)", repoPath)
pid := process.Add(desc, cmd)
go func() {
// In case process became zombie.
@@ -224,5 +238,9 @@ func GetDiff(repoPath, commitid string) (*Diff, error) {
}
}()
- return ParsePatch(pid, cmd, rd)
+ return ParsePatch(pid, maxlines, cmd, rd)
+}
+
+func GetDiffCommit(repoPath, commitId string, maxlines int) (*Diff, error) {
+ return GetDiffRange(repoPath, "", commitId, maxlines)
}
diff --git a/models/issue.go b/models/issue.go
index 307ace816d..f16c2e256d 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -612,7 +612,7 @@ type Milestone struct {
RepoId int64 `xorm:"INDEX"`
Index int64
Name string
- Content string
+ Content string `xorm:"TEXT"`
RenderedContent string `xorm:"-"`
IsClosed bool
NumIssues int
diff --git a/models/login.go b/models/login.go
index da7722f294..2c5fc68e9c 100644
--- a/models/login.go
+++ b/models/login.go
@@ -161,12 +161,8 @@ func UserSignIn(uname, passwd string) (*User, error) {
return nil, err
}
- if u.LoginType == NOTYPE {
- if has {
- u.LoginType = PLAIN
- } else {
- return nil, ErrUserNotExist
- }
+ if u.LoginType == NOTYPE && has {
+ u.LoginType = PLAIN
}
// For plain login, user must exist to reach this line.
diff --git a/models/models.go b/models/models.go
index 4e2e08cf83..570df0c114 100644
--- a/models/models.go
+++ b/models/models.go
@@ -55,11 +55,12 @@ func LoadModelsConfig() {
DbCfg.Path = setting.Cfg.MustValue("database", "PATH", "data/gogs.db")
}
-func NewTestEngine(x *xorm.Engine) (err error) {
+func getEngine() (*xorm.Engine, error) {
+ cnnstr := ""
switch DbCfg.Type {
case "mysql":
- x, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
- DbCfg.User, DbCfg.Pwd, DbCfg.Host, DbCfg.Name))
+ cnnstr = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
+ DbCfg.User, DbCfg.Pwd, DbCfg.Host, DbCfg.Name)
case "postgres":
var host, port = "127.0.0.1", "5432"
fields := strings.Split(DbCfg.Host, ":")
@@ -69,48 +70,33 @@ func NewTestEngine(x *xorm.Engine) (err error) {
if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 {
port = fields[1]
}
- cnnstr := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s",
+ cnnstr = fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s",
DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode)
- x, err = xorm.NewEngine("postgres", cnnstr)
case "sqlite3":
if !EnableSQLite3 {
- return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
+ return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
- x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
+ cnnstr = "file:" + DbCfg.Path + "?cache=shared&mode=rwc"
default:
- return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
+ return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
+ return xorm.NewEngine(DbCfg.Type, cnnstr)
+}
+
+func NewTestEngine(x *xorm.Engine) (err error) {
+ x, err = getEngine()
if err != nil {
- return fmt.Errorf("models.init(fail to conntect database): %v", err)
+ return fmt.Errorf("models.init(fail to connect to database): %v", err)
}
+
return x.Sync(tables...)
}
func SetEngine() (err error) {
- switch DbCfg.Type {
- case "mysql":
- x, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
- DbCfg.User, DbCfg.Pwd, DbCfg.Host, DbCfg.Name))
- 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]
- }
- if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 {
- port = fields[1]
- }
- x, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s",
- DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode))
- case "sqlite3":
- os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
- x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
- default:
- return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
- }
+ x, err = getEngine()
if err != nil {
- return fmt.Errorf("models.init(fail to conntect database): %v", err)
+ return fmt.Errorf("models.init(fail to connect to database): %v", err)
}
// WARNNING: for serv command, MUST remove the output to os.stdout,
@@ -125,6 +111,7 @@ func SetEngine() (err error) {
x.Logger = xorm.NewSimpleLogger(f)
x.ShowSQL = true
+ x.ShowInfo = true
x.ShowDebug = true
x.ShowErr = true
x.ShowWarn = true
diff --git a/models/org.go b/models/org.go
index ce50670582..31db8e3643 100644
--- a/models/org.go
+++ b/models/org.go
@@ -507,7 +507,7 @@ func (t *Team) AddRepository(repo *Repository) (err error) {
mode := AuthorizeToAccessType(t.Authorize)
for _, u := range t.Members {
- auth, err := GetHighestAuthorize(t.OrgId, u.Id, t.Id, repo.Id)
+ auth, err := GetHighestAuthorize(t.OrgId, u.Id, repo.Id, t.Id)
if err != nil {
sess.Rollback()
return err
@@ -517,13 +517,7 @@ func (t *Team) AddRepository(repo *Repository) (err error) {
UserName: u.LowerName,
RepoName: path.Join(repo.Owner.LowerName, repo.LowerName),
}
- if auth == 0 {
- access.Mode = mode
- if _, err = sess.Insert(access); err != nil {
- sess.Rollback()
- return fmt.Errorf("fail to insert access: %v", err)
- }
- } else if auth < t.Authorize {
+ if auth < t.Authorize {
if err = addAccessWithAuthorize(sess, access, mode); err != nil {
sess.Rollback()
return err
@@ -570,7 +564,7 @@ func (t *Team) RemoveRepository(repoId int64) error {
// Remove access to team members.
for _, u := range t.Members {
- auth, err := GetHighestAuthorize(t.OrgId, u.Id, t.Id, repo.Id)
+ auth, err := GetHighestAuthorize(t.OrgId, u.Id, repo.Id, t.Id)
if err != nil {
sess.Rollback()
return err
@@ -668,7 +662,7 @@ func GetTeamById(teamId int64) (*Team, error) {
}
// GetHighestAuthorize returns highest repository authorize level for given user and team.
-func GetHighestAuthorize(orgId, uid, teamId, repoId int64) (AuthorizeType, error) {
+func GetHighestAuthorize(orgId, uid, repoId, teamId int64) (AuthorizeType, error) {
ts, err := GetUserTeams(orgId, uid)
if err != nil {
return 0, err
@@ -687,6 +681,7 @@ func GetHighestAuthorize(orgId, uid, teamId, repoId int64) (AuthorizeType, error
}
}
}
+
return auth, nil
}
@@ -728,7 +723,7 @@ func UpdateTeam(t *Team, authChanged bool) (err error) {
// ORG_WRITABLE is the highest authorize level for now.
// Skip checking others if current team has this level.
if t.Authorize < ORG_WRITABLE {
- auth, err := GetHighestAuthorize(org.Id, u.Id, t.Id, repo.Id)
+ auth, err := GetHighestAuthorize(t.OrgId, u.Id, repo.Id, t.Id)
if err != nil {
sess.Rollback()
return err
@@ -782,7 +777,7 @@ func DeleteTeam(t *Team) error {
// Delete all accesses.
for _, repo := range t.Repos {
for _, u := range t.Members {
- auth, err := GetHighestAuthorize(org.Id, u.Id, t.Id, repo.Id)
+ auth, err := GetHighestAuthorize(t.OrgId, u.Id, repo.Id, t.Id)
if err != nil {
sess.Rollback()
return err
@@ -943,7 +938,7 @@ func AddTeamMember(orgId, teamId, uid int64) error {
// Give access to team repositories.
mode := AuthorizeToAccessType(t.Authorize)
for _, repo := range t.Repos {
- auth, err := GetHighestAuthorize(orgId, uid, teamId, repo.Id)
+ auth, err := GetHighestAuthorize(t.OrgId, u.Id, repo.Id, teamId)
if err != nil {
sess.Rollback()
return err
@@ -953,14 +948,7 @@ func AddTeamMember(orgId, teamId, uid int64) error {
UserName: u.LowerName,
RepoName: path.Join(org.LowerName, repo.LowerName),
}
- // Equal 0 means given access doesn't exist.
- if auth == 0 {
- access.Mode = mode
- if _, err = sess.Insert(access); err != nil {
- sess.Rollback()
- return fmt.Errorf("fail to insert access: %v", err)
- }
- } else if auth < t.Authorize {
+ if auth < t.Authorize {
if err = addAccessWithAuthorize(sess, access, mode); err != nil {
sess.Rollback()
return err
@@ -1037,7 +1025,7 @@ func removeTeamMemberWithSess(orgId, teamId, uid int64, sess *xorm.Session) erro
// Delete access to team repositories.
for _, repo := range t.Repos {
- auth, err := GetHighestAuthorize(orgId, uid, teamId, repo.Id)
+ auth, err := GetHighestAuthorize(t.OrgId, u.Id, repo.Id, teamId)
if err != nil {
sess.Rollback()
return err
diff --git a/models/publickey.go b/models/publickey.go
index 1246cffc58..8bb924e853 100644
--- a/models/publickey.go
+++ b/models/publickey.go
@@ -22,6 +22,7 @@ import (
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
+ "github.com/gogits/gogs/modules/setting"
)
const (
@@ -100,6 +101,7 @@ var (
"(MCE)": 1702,
"(McE)": 1702,
"(RSA)": 2048,
+ "(DSA)": 1024,
}
)
@@ -119,23 +121,30 @@ func CheckPublicKeyString(content string) (bool, error) {
tmpFile.WriteString(content)
tmpFile.Close()
- // … see if ssh-keygen recognizes its contents
+ // Check if ssh-keygen recognizes its contents.
stdout, stderr, err := process.Exec("CheckPublicKeyString", "ssh-keygen", "-l", "-f", tmpPath)
if err != nil {
return false, errors.New("ssh-keygen -l -f: " + stderr)
} else if len(stdout) < 2 {
return false, errors.New("ssh-keygen returned not enough output to evaluate the key")
}
+
+ // The ssh-keygen in Windows does not print key type, so no need go further.
+ if setting.IsWindows {
+ return true, nil
+ }
+
sshKeygenOutput := strings.Split(stdout, " ")
if len(sshKeygenOutput) < 4 {
return false, errors.New("Not enough fields returned by ssh-keygen -l -f")
}
+
+ // Check if key type and key size match.
keySize, err := com.StrTo(sshKeygenOutput[0]).Int()
if err != nil {
return false, errors.New("Cannot get key size of the given key")
}
keyType := strings.TrimSpace(sshKeygenOutput[len(sshKeygenOutput)-1])
-
if minimumKeySize := MinimumKeySize[keyType]; minimumKeySize == 0 {
return false, errors.New("Sorry, unrecognized public key type")
} else if keySize < minimumKeySize {
@@ -160,10 +169,14 @@ func saveAuthorizedKeyFile(key *PublicKey) error {
if err != nil {
return err
}
- if finfo.Mode().Perm() > 0600 {
- log.Error(4, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
- if err = f.Chmod(0600); err != nil {
- return err
+
+ // FIXME: following command does not support in Windows.
+ if !setting.IsWindows {
+ if finfo.Mode().Perm() > 0600 {
+ log.Error(4, "authorized_keys file has unusual permission flags: %s - setting to -rw-------", finfo.Mode().Perm().String())
+ if err = f.Chmod(0600); err != nil {
+ return err
+ }
}
}
diff --git a/models/repo.go b/models/repo.go
index 4703696678..a79c2491ce 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -95,24 +95,35 @@ func NewRepoContext() {
if err != nil {
log.Fatal(4, "Fail to get Git version: %v", err)
}
- if ver.Major < 2 && ver.Minor < 8 {
- log.Fatal(4, "Gogs requires Git version greater or equal to 1.8.0")
+
+ reqVer, err := git.ParseVersion("1.7.1")
+ if err != nil {
+ log.Fatal(4, "Fail to parse required Git version: %v", err)
+ }
+ if ver.LessThan(reqVer) {
+ log.Fatal(4, "Gogs requires Git version greater or equal to 1.7.1")
}
- // Check if server has basic git setting.
- stdout, stderr, err := process.Exec("NewRepoContext(get setting)", "git", "config", "--get", "user.name")
- if err != nil {
- log.Fatal(4, "Fail to get git user.name: %s", stderr)
- } else if err != nil || len(strings.TrimSpace(stdout)) == 0 {
- if _, stderr, err = process.Exec("NewRepoContext(set email)", "git", "config", "--global", "user.email", "gogitservice@gmail.com"); err != nil {
- log.Fatal(4, "Fail to set git user.email: %s", stderr)
- } else if _, stderr, err = process.Exec("NewRepoContext(set name)", "git", "config", "--global", "user.name", "Gogs"); err != nil {
- log.Fatal(4, "Fail to set git user.name: %s", stderr)
+ // Check if server has basic git setting and set if not.
+ if stdout, stderr, err := process.Exec("NewRepoContext(get setting)", "git", "config", "--get", "user.name"); err != nil || strings.TrimSpace(stdout) == "" {
+ // ExitError indicates user.name is not set
+ if _, ok := err.(*exec.ExitError); ok || strings.TrimSpace(stdout) == "" {
+ stndrdUserName := "Gogs"
+ stndrdUserEmail := "gogitservice@gmail.com"
+ if _, stderr, gerr := process.Exec("NewRepoContext(set name)", "git", "config", "--global", "user.name", stndrdUserName); gerr != nil {
+ log.Fatal(4, "Fail to set git user.name(%s): %s", gerr, stderr)
+ }
+ if _, stderr, gerr := process.Exec("NewRepoContext(set email)", "git", "config", "--global", "user.email", stndrdUserEmail); gerr != nil {
+ log.Fatal(4, "Fail to set git user.email(%s): %s", gerr, stderr)
+ }
+ log.Info("Git user.name and user.email set to %s <%s>", stndrdUserName, stndrdUserEmail)
+ } else {
+ log.Fatal(4, "Fail to get git user.name(%s): %s", err, stderr)
}
}
// Set git some configurations.
- if _, stderr, err = process.Exec("NewRepoContext(git config --global core.quotepath false)",
+ if _, stderr, err := process.Exec("NewRepoContext(git config --global core.quotepath false)",
"git", "config", "--global", "core.quotepath", "false"); err != nil {
log.Fatal(4, "Fail to execute 'git config --global core.quotepath false': %s", stderr)
}
@@ -305,30 +316,17 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str
}
repo.IsMirror = true
return repo, UpdateRepository(repo)
+ } else {
+ os.RemoveAll(repoPath)
}
- // Clone from local repository.
+ // this command could for both migrate and mirror
_, stderr, err := process.ExecTimeout(10*time.Minute,
- fmt.Sprintf("MigrateRepository(git clone): %s", repoPath),
- "git", "clone", repoPath, tmpDir)
+ fmt.Sprintf("MigrateRepository: %s", repoPath),
+ "git", "clone", "--mirror", "--bare", url, repoPath)
if err != nil {
return repo, errors.New("git clone: " + stderr)
}
-
- // Add remote and fetch data.
- if _, stderr, err = process.ExecDir(3*time.Minute,
- tmpDir, fmt.Sprintf("MigrateRepository(git pull): %s", repoPath),
- "git", "remote", "add", "-f", "--tags", "upstream", url); err != nil {
- return repo, errors.New("git remote: " + stderr)
- }
-
- // Push data to local repository.
- if _, stderr, err = process.ExecDir(3*time.Minute,
- tmpDir, fmt.Sprintf("MigrateRepository(git push): %s", repoPath),
- "git", "push", "--tags", "origin", "refs/remotes/upstream/*:refs/heads/*"); err != nil {
- return repo, errors.New("git push: " + stderr)
- }
-
return repo, UpdateRepository(repo)
}
@@ -651,29 +649,54 @@ func RepoPath(userName, repoName string) string {
}
// TransferOwnership transfers all corresponding setting from old user to new one.
-func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
+func TransferOwnership(u *User, newOwner string, repo *Repository) error {
newUser, err := GetUserByName(newOwner)
if err != nil {
return err
}
+ // Check if new owner has repository with same name.
+ has, err := IsRepositoryExist(newUser, repo.Name)
+ if err != nil {
+ return err
+ } else if has {
+ return ErrRepoAlreadyExist
+ }
+
sess := x.NewSession()
defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}
- if _, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).
- And("user_name = ?", u.LowerName).Update(&Access{UserName: newUser.LowerName}); err != nil {
- sess.Rollback()
- return err
+ owner := repo.Owner
+ oldRepoLink := path.Join(owner.LowerName, repo.LowerName)
+ // Delete all access first if current owner is an organization.
+ if owner.IsOrganization() {
+ if _, err = sess.Where("repo_name=?", oldRepoLink).Delete(new(Access)); err != nil {
+ sess.Rollback()
+ return fmt.Errorf("fail to delete current accesses: %v", err)
+ }
+ } else {
+ // Delete current owner access.
+ if _, err = sess.Where("repo_name=?", oldRepoLink).And("user_name=?", owner.LowerName).
+ Delete(new(Access)); err != nil {
+ sess.Rollback()
+ return fmt.Errorf("fail to delete access(owner): %v", err)
+ }
+ // In case new owner has access.
+ if _, err = sess.Where("repo_name=?", oldRepoLink).And("user_name=?", newUser.LowerName).
+ Delete(new(Access)); err != nil {
+ sess.Rollback()
+ return fmt.Errorf("fail to delete access(new user): %v", err)
+ }
}
- if _, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).Update(&Access{
- RepoName: newUser.LowerName + "/" + repo.LowerName,
- }); err != nil {
+ // Change accesses to new repository path.
+ if _, err = sess.Where("repo_name=?", oldRepoLink).
+ Update(&Access{RepoName: path.Join(newUser.LowerName, repo.LowerName)}); err != nil {
sess.Rollback()
- return err
+ return fmt.Errorf("fail to update access(change reponame): %v", err)
}
// Update repository.
@@ -689,17 +712,17 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
return err
}
- if _, err = sess.Exec("UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?", u.Id); err != nil {
+ if _, err = sess.Exec("UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?", owner.Id); err != nil {
sess.Rollback()
return err
}
+ mode := WRITABLE
+ if repo.IsMirror {
+ mode = READABLE
+ }
// New owner is organization.
if newUser.IsOrganization() {
- mode := WRITABLE
- if repo.IsMirror {
- mode = READABLE
- }
access := &Access{
RepoName: path.Join(newUser.LowerName, repo.LowerName),
Mode: mode,
@@ -724,12 +747,6 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
}
}
- if _, err = sess.Exec(
- "UPDATE `user` SET num_repos = num_repos + 1 WHERE id = ?", u.Id); err != nil {
- sess.Rollback()
- return err
- }
-
// Update owner team info and count.
t.RepoIds += "$" + com.ToStr(repo.Id) + "|"
t.NumRepos++
@@ -737,10 +754,20 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
sess.Rollback()
return err
}
+ } else {
+ access := &Access{
+ RepoName: path.Join(newUser.LowerName, repo.LowerName),
+ UserName: newUser.LowerName,
+ Mode: mode,
+ }
+ if _, err = sess.Insert(access); err != nil {
+ sess.Rollback()
+ return fmt.Errorf("fail to insert access: %v", err)
+ }
}
// Change repository directory name.
- if err = os.Rename(RepoPath(u.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil {
+ if err = os.Rename(RepoPath(owner.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil {
sess.Rollback()
return err
}
@@ -749,14 +776,8 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
return err
}
- // Add watch of new owner to repository.
- if !newUser.IsOrganization() {
- if err = WatchRepo(newUser.Id, repo.Id, true); err != nil {
- log.Error(4, "WatchRepo", err)
- }
- }
- if err = WatchRepo(u.Id, repo.Id, false); err != nil {
- log.Error(4, "WatchRepo2", err)
+ if err = WatchRepo(newUser.Id, repo.Id, true); err != nil {
+ log.Error(4, "WatchRepo", err)
}
if err = TransferRepoAction(u, newUser, repo); err != nil {
@@ -940,9 +961,9 @@ func GetRepositoryByRef(ref string) (*Repository, error) {
}
// GetRepositoryByName returns the repository by given name under user if exists.
-func GetRepositoryByName(userId int64, repoName string) (*Repository, error) {
+func GetRepositoryByName(uid int64, repoName string) (*Repository, error) {
repo := &Repository{
- OwnerId: userId,
+ OwnerId: uid,
LowerName: strings.ToLower(repoName),
}
has, err := x.Get(repo)
@@ -979,8 +1000,8 @@ func GetRepositories(uid int64, private bool) ([]*Repository, error) {
}
// GetRecentUpdatedRepositories returns the list of repositories that are recently updated.
-func GetRecentUpdatedRepositories() (repos []*Repository, err error) {
- err = x.Where("is_private=?", false).Limit(5).Desc("updated").Find(&repos)
+func GetRecentUpdatedRepositories(num int) (repos []*Repository, err error) {
+ err = x.Where("is_private=?", false).Limit(num).Desc("updated").Find(&repos)
return repos, err
}
@@ -1081,6 +1102,13 @@ func SearchRepositoryByName(opt SearchOption) (repos []*Repository, err error) {
return repos, err
}
+// __ __ __ .__
+// / \ / \_____ _/ |_ ____ | |__
+// \ \/\/ /\__ \\ __\/ ___\| | \
+// \ / / __ \| | \ \___| Y \
+// \__/\ / (____ /__| \___ >___| /
+// \/ \/ \/ \/
+
// Watch is connection request for receiving repository notifycation.
type Watch struct {
Id int64
@@ -1151,6 +1179,13 @@ func NotifyWatchers(act *Action) error {
return nil
}
+// _________ __
+// / _____// |______ _______
+// \_____ \\ __\__ \\_ __ \
+// / \| | / __ \| | \/
+// /_______ /|__| (____ /__|
+// \/ \/
+
type Star struct {
Id int64
Uid int64 `xorm:"UNIQUE(s)"`
@@ -1165,16 +1200,20 @@ func StarRepo(uid, repoId int64, star bool) (err error) {
}
if _, err = x.Insert(&Star{Uid: uid, RepoId: repoId}); err != nil {
return err
+ } else if _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars + 1 WHERE id = ?", repoId); err != nil {
+ return err
}
- _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars + 1 WHERE id = ?", repoId)
+ _, err = x.Exec("UPDATE `user` SET num_stars = num_stars + 1 WHERE id = ?", uid)
} else {
if !IsStaring(uid, repoId) {
return nil
}
if _, err = x.Delete(&Star{0, uid, repoId}); err != nil {
return err
+ } else if _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars - 1 WHERE id = ?", repoId); err != nil {
+ return err
}
- _, err = x.Exec("UPDATE `repository` SET num_stars = num_stars - 1 WHERE id = ?", repoId)
+ _, err = x.Exec("UPDATE `user` SET num_stars = num_stars - 1 WHERE id = ?", uid)
}
return err
}
diff --git a/models/slack.go b/models/slack.go
new file mode 100644
index 0000000000..3dd40759af
--- /dev/null
+++ b/models/slack.go
@@ -0,0 +1,125 @@
+// Copyright 2014 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 (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "strings"
+)
+
+const (
+ SLACK_COLOR string = "#dd4b39"
+)
+
+type Slack struct {
+ Domain string `json:"domain"`
+ Token string `json:"token"`
+ Channel string `json:"channel"`
+}
+
+type SlackPayload struct {
+ Channel string `json:"channel"`
+ Text string `json:"text"`
+ Username string `json:"username"`
+ IconUrl string `json:"icon_url"`
+ UnfurlLinks int `json:"unfurl_links"`
+ LinkNames int `json:"link_names"`
+ Attachments []SlackAttachment `json:"attachments"`
+}
+
+type SlackAttachment struct {
+ Color string `json:"color"`
+ Text string `json:"text"`
+}
+
+func GetSlackURL(domain string, token string) string {
+ return fmt.Sprintf(
+ "https://%s.slack.com/services/hooks/incoming-webhook?token=%s",
+ domain,
+ token,
+ )
+}
+
+func (p SlackPayload) GetJSONPayload() ([]byte, error) {
+ data, err := json.Marshal(p)
+ if err != nil {
+ return []byte{}, err
+ }
+ return data, nil
+}
+
+func GetSlackPayload(p *Payload, meta string) (*SlackPayload, error) {
+ slack := &Slack{}
+ slackPayload := &SlackPayload{}
+ if err := json.Unmarshal([]byte(meta), &slack); err != nil {
+ return slackPayload, errors.New("GetSlackPayload meta json:" + err.Error())
+ }
+
+ // TODO: handle different payload types: push, new branch, delete branch etc.
+ // when they are added to gogs. Only handles push now
+ return getSlackPushPayload(p, slack)
+}
+
+func getSlackPushPayload(p *Payload, slack *Slack) (*SlackPayload, error) {
+ // n new commits
+ refSplit := strings.Split(p.Ref, "/")
+ branchName := refSplit[len(refSplit)-1]
+ var commitString string
+
+ if len(p.Commits) == 1 {
+ commitString = "1 new commit"
+ if p.CompareUrl != "" {
+ commitString = SlackLinkFormatter(p.CompareUrl, commitString)
+ }
+ } else {
+ commitString = fmt.Sprintf("%d new commits", len(p.Commits))
+ if p.CompareUrl != "" {
+ commitString = SlackLinkFormatter(p.CompareUrl, commitString)
+ }
+ }
+
+ 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)
+ 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))
+ // 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: "gogs",
+ IconUrl: "https://raw.githubusercontent.com/gogits/gogs/master/public/img/favicon.png",
+ UnfurlLinks: 0,
+ LinkNames: 0,
+ Attachments: slackAttachments,
+ }, nil
+}
+
+// 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, "&", "&", -1)
+ first = strings.Replace(first, "<", "<", -1)
+ first = strings.Replace(first, ">", ">", -1)
+ return first
+}
+
+func SlackLinkFormatter(url string, text string) string {
+ return fmt.Sprintf("<%s|%s>", url, SlackTextFormatter(text))
+}
diff --git a/models/update.go b/models/update.go
index 68a92ada1d..d939a90874 100644
--- a/models/update.go
+++ b/models/update.go
@@ -23,6 +23,10 @@ type UpdateTask struct {
NewCommitId string
}
+const (
+ MAX_COMMITS int = 5
+)
+
func AddUpdateTask(task *UpdateTask) error {
_, err := x.Insert(task)
return err
@@ -101,7 +105,7 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
commit := &base.PushCommits{}
if err = CommitRepoAction(userId, ru.Id, userName, actEmail,
- repos.Id, repoUserName, repoName, refName, commit); err != nil {
+ repos.Id, repoUserName, repoName, refName, commit, oldCommitId, newCommitId); err != nil {
log.GitLogger.Fatal(4, "runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err)
}
return err
@@ -132,7 +136,6 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
// if commits push
commits := make([]*base.PushCommit, 0)
- var maxCommits = 2
var actEmail string
for e := l.Front(); e != nil; e = e.Next() {
commit := e.Value.(*git.Commit)
@@ -145,14 +148,14 @@ func Update(refName, oldCommitId, newCommitId, userName, repoUserName, repoName
commit.Message(),
commit.Author.Email,
commit.Author.Name})
- if len(commits) >= maxCommits {
+ if len(commits) >= MAX_COMMITS {
break
}
}
//commits = append(commits, []string{lastCommit.Id().String(), lastCommit.Message()})
if err = CommitRepoAction(userId, ru.Id, userName, actEmail,
- repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits}); err != nil {
+ repos.Id, repoUserName, repoName, refName, &base.PushCommits{l.Len(), commits}, oldCommitId, newCommitId); err != nil {
return fmt.Errorf("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err)
}
return nil
diff --git a/models/user.go b/models/user.go
index 96881ea355..ee8f8586d5 100644
--- a/models/user.go
+++ b/models/user.go
@@ -5,6 +5,7 @@
package models
import (
+ "container/list"
"crypto/sha256"
"encoding/hex"
"errors"
@@ -82,22 +83,22 @@ type User struct {
// DashboardLink returns the user dashboard page link.
func (u *User) DashboardLink() string {
if u.IsOrganization() {
- return "/org/" + u.Name + "/dashboard/"
+ return setting.AppSubUrl + "/org/" + u.Name + "/dashboard/"
}
- return "/"
+ return setting.AppSubUrl + "/"
}
// HomeLink returns the user home page link.
func (u *User) HomeLink() string {
- return "/user/" + u.Name
+ return setting.AppSubUrl + "/" + u.Name
}
// AvatarLink returns user gravatar link.
func (u *User) AvatarLink() string {
if setting.DisableGravatar {
- return "/img/avatar_default.jpg"
+ return setting.AppSubUrl + "/img/avatar_default.jpg"
} else if setting.Service.EnableCacheAvatar {
- return "/avatar/" + u.Avatar
+ return setting.AppSubUrl + "/avatar/" + u.Avatar
}
return "//1.gravatar.com/avatar/" + u.Avatar
}
@@ -167,6 +168,14 @@ func (u *User) GetOrganizations() error {
return nil
}
+// GetFullNameFallback returns Full Name if set, otherwise username
+func (u *User) GetFullNameFallback() string {
+ if u.FullName == "" {
+ return u.Name
+ }
+ return u.FullName
+}
+
// IsUserExist checks if given user name exist,
// the user name should be noncased unique.
func IsUserExist(name string) (bool, error) {
@@ -505,6 +514,49 @@ func GetUserIdsByNames(names []string) []int64 {
return ids
}
+// UserCommit represtns a commit with validation of user.
+type UserCommit struct {
+ UserName string
+ *git.Commit
+}
+
+// ValidateCommitWithEmail chceck if author's e-mail of commit is corresponsind to a user.
+func ValidateCommitWithEmail(c *git.Commit) (uname string) {
+ u, err := GetUserByEmail(c.Author.Email)
+ if err == nil {
+ uname = u.Name
+ }
+ return uname
+}
+
+// ValidateCommitsWithEmails checks if authors' e-mails of commits are corresponding to users.
+func ValidateCommitsWithEmails(oldCommits *list.List) *list.List {
+ emails := map[string]string{}
+ newCommits := list.New()
+ e := oldCommits.Front()
+ for e != nil {
+ c := e.Value.(*git.Commit)
+
+ uname := ""
+ if v, ok := emails[c.Author.Email]; !ok {
+ u, err := GetUserByEmail(c.Author.Email)
+ if err == nil {
+ uname = u.Name
+ }
+ emails[c.Author.Email] = uname
+ } else {
+ uname = v
+ }
+
+ newCommits.PushBack(UserCommit{
+ UserName: uname,
+ Commit: c,
+ })
+ e = e.Next()
+ }
+ return newCommits
+}
+
// GetUserByEmail returns the user object by given e-mail if exists.
func GetUserByEmail(email string) (*User, error) {
if len(email) == 0 {
@@ -548,27 +600,27 @@ type Follow struct {
// FollowUser marks someone be another's follower.
func FollowUser(userId int64, followId int64) (err error) {
- session := x.NewSession()
- defer session.Close()
- session.Begin()
+ sess := x.NewSession()
+ defer sess.Close()
+ sess.Begin()
- if _, err = session.Insert(&Follow{UserId: userId, FollowId: followId}); err != nil {
- session.Rollback()
+ if _, err = sess.Insert(&Follow{UserId: userId, FollowId: followId}); err != nil {
+ sess.Rollback()
return err
}
rawSql := "UPDATE `user` SET num_followers = num_followers + 1 WHERE id = ?"
- if _, err = session.Exec(rawSql, followId); err != nil {
- session.Rollback()
+ if _, err = sess.Exec(rawSql, followId); err != nil {
+ sess.Rollback()
return err
}
rawSql = "UPDATE `user` SET num_followings = num_followings + 1 WHERE id = ?"
- if _, err = session.Exec(rawSql, userId); err != nil {
- session.Rollback()
+ if _, err = sess.Exec(rawSql, userId); err != nil {
+ sess.Rollback()
return err
}
- return session.Commit()
+ return sess.Commit()
}
// UnFollowUser unmarks someone be another's follower.
diff --git a/models/webhook.go b/models/webhook.go
index ced7936646..9508c98a5e 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -7,6 +7,7 @@ package models
import (
"encoding/json"
"errors"
+ "io/ioutil"
"time"
"github.com/gogits/gogs/modules/httplib"
@@ -33,15 +34,18 @@ type HookEvent struct {
// Webhook represents a web hook object.
type Webhook struct {
- Id int64
- RepoId int64
- Url string `xorm:"TEXT"`
- ContentType HookContentType
- Secret string `xorm:"TEXT"`
- Events string `xorm:"TEXT"`
- *HookEvent `xorm:"-"`
- IsSsl bool
- IsActive bool
+ Id int64
+ RepoId int64
+ Url string `xorm:"TEXT"`
+ ContentType HookContentType
+ Secret string `xorm:"TEXT"`
+ Events string `xorm:"TEXT"`
+ *HookEvent `xorm:"-"`
+ IsSsl bool
+ IsActive bool
+ HookTaskType HookTaskType
+ Meta string `xorm:"TEXT"` // store hook-specific attributes
+ OrgId int64
}
// GetEvent handles conversion from Events to HookEvent.
@@ -52,6 +56,14 @@ func (w *Webhook) GetEvent() {
}
}
+func (w *Webhook) GetSlackHook() *Slack {
+ s := &Slack{}
+ if err := json.Unmarshal([]byte(w.Meta), s); err != nil {
+ log.Error(4, "webhook.GetSlackHook(%d): %v", w.Id, err)
+ }
+ return s
+}
+
// UpdateEvent handles conversion from HookEvent to Events.
func (w *Webhook) UpdateEvent() error {
data, err := json.Marshal(w.HookEvent)
@@ -87,7 +99,7 @@ func GetWebhookById(hookId int64) (*Webhook, error) {
// GetActiveWebhooksByRepoId returns all active webhooks of repository.
func GetActiveWebhooksByRepoId(repoId int64) (ws []*Webhook, err error) {
- err = x.Find(&ws, &Webhook{RepoId: repoId, IsActive: true})
+ err = x.Where("repo_id=?", repoId).And("is_active=?", true).Find(&ws)
return ws, err
}
@@ -109,6 +121,18 @@ func DeleteWebhook(hookId int64) error {
return err
}
+// GetWebhooksByOrgId returns all webhooks for an organization.
+func GetWebhooksByOrgId(orgId int64) (ws []*Webhook, err error) {
+ err = x.Find(&ws, &Webhook{OrgId: orgId})
+ return ws, err
+}
+
+// GetActiveWebhooksByOrgId returns all active webhooks for an organization.
+func GetActiveWebhooksByOrgId(orgId int64) (ws []*Webhook, err error) {
+ err = x.Where("org_id=?", orgId).And("is_active=?", true).Find(&ws)
+ return ws, err
+}
+
// ___ ___ __ ___________ __
// / | \ ____ ____ | | _\__ ___/____ _____| | __
// / ~ \/ _ \ / _ \| |/ / | | \__ \ / ___/ |/ /
@@ -119,8 +143,8 @@ func DeleteWebhook(hookId int64) error {
type HookTaskType int
const (
- WEBHOOK HookTaskType = iota + 1
- SERVICE
+ GOGS HookTaskType = iota + 1
+ SLACK
)
type HookEventType string
@@ -130,8 +154,9 @@ const (
)
type PayloadAuthor struct {
- Name string `json:"name"`
- Email string `json:"email"`
+ Name string `json:"name"`
+ Email string `json:"email"`
+ UserName string `json:"username"`
}
type PayloadCommit struct {
@@ -148,17 +173,32 @@ type PayloadRepo struct {
Description string `json:"description"`
Website string `json:"website"`
Watchers int `json:"watchers"`
- Owner *PayloadAuthor `json:"author"`
+ Owner *PayloadAuthor `json:"owner"`
Private bool `json:"private"`
}
+type BasePayload interface {
+ GetJSONPayload() ([]byte, error)
+}
+
// Payload represents a payload information of hook.
type Payload struct {
- Secret string `json:"secret"`
- Ref string `json:"ref"`
- Commits []*PayloadCommit `json:"commits"`
- Repo *PayloadRepo `json:"repository"`
- Pusher *PayloadAuthor `json:"pusher"`
+ Secret string `json:"secret"`
+ Ref string `json:"ref"`
+ Commits []*PayloadCommit `json:"commits"`
+ Repo *PayloadRepo `json:"repository"`
+ Pusher *PayloadAuthor `json:"pusher"`
+ Before string `json:"before"`
+ After string `json:"after"`
+ CompareUrl string `json:"compare_url"`
+}
+
+func (p Payload) GetJSONPayload() ([]byte, error) {
+ data, err := json.Marshal(p)
+ if err != nil {
+ return []byte{}, err
+ }
+ return data, nil
}
// HookTask represents a hook task.
@@ -167,19 +207,19 @@ type HookTask struct {
Uuid string
Type HookTaskType
Url string
- *Payload `xorm:"-"`
+ BasePayload `xorm:"-"`
PayloadContent string `xorm:"TEXT"`
ContentType HookContentType
EventType HookEventType
IsSsl bool
- IsDeliveried bool
+ IsDelivered bool
IsSucceed bool
}
// CreateHookTask creates a new hook task,
// it handles conversion from Payload to PayloadContent.
func CreateHookTask(t *HookTask) error {
- data, err := json.Marshal(t.Payload)
+ data, err := t.BasePayload.GetJSONPayload()
if err != nil {
return err
}
@@ -191,14 +231,15 @@ func CreateHookTask(t *HookTask) error {
// UpdateHookTask updates information of hook task.
func UpdateHookTask(t *HookTask) error {
- _, err := x.AllCols().Update(t)
+ _, err := x.Id(t.Id).AllCols().Update(t)
return err
}
// DeliverHooks checks and delivers undelivered hooks.
func DeliverHooks() {
+ tasks := make([]*HookTask, 0, 10)
timeout := time.Duration(setting.WebhookDeliverTimeout) * time.Second
- x.Where("is_deliveried=?", false).Iterate(new(HookTask),
+ x.Where("is_delivered=?", false).Iterate(new(HookTask),
func(idx int, bean interface{}) error {
t := bean.(*HookTask)
req := httplib.Post(t.Url).SetTimeout(timeout, timeout).
@@ -212,21 +253,50 @@ func DeliverHooks() {
req.Param("payload", t.PayloadContent)
}
- t.IsDeliveried = true
+ t.IsDelivered = true
// TODO: record response.
- if _, err := req.Response(); err != nil {
- log.Error(4, "Delivery: %v", err)
- } else {
- t.IsSucceed = true
+ switch t.Type {
+ case GOGS:
+ {
+ if _, err := req.Response(); err != nil {
+ log.Error(4, "Delivery: %v", err)
+ } else {
+ t.IsSucceed = true
+ }
+ }
+ case SLACK:
+ {
+ if res, err := req.Response(); err != nil {
+ log.Error(4, "Delivery: %v", err)
+ } else {
+ defer res.Body.Close()
+ contents, err := ioutil.ReadAll(res.Body)
+ if err != nil {
+ log.Error(4, "%s", err)
+ } else {
+ if string(contents) != "ok" {
+ log.Error(4, "slack failed with: %s", string(contents))
+ } else {
+ t.IsSucceed = true
+ }
+ }
+ }
+ }
}
- if err := UpdateHookTask(t); err != nil {
- log.Error(4, "UpdateHookTask: %v", err)
- return nil
- }
+ tasks = append(tasks, t)
- log.Trace("Hook delivered(%s): %s", t.Uuid, t.PayloadContent)
+ if t.IsSucceed {
+ log.Trace("Hook delivered(%s): %s", t.Uuid, t.PayloadContent)
+ }
return nil
})
+
+ // Update hook task status.
+ for _, t := range tasks {
+ if err := UpdateHookTask(t); err != nil {
+ log.Error(4, "UpdateHookTask(%d): %v", t.Id, err)
+ }
+ }
}
diff --git a/modules/asn1-ber/LICENSE b/modules/asn1-ber/LICENSE
new file mode 100644
index 0000000000..7448756763
--- /dev/null
+++ b/modules/asn1-ber/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/modules/asn1-ber/Makefile b/modules/asn1-ber/Makefile
new file mode 100644
index 0000000000..acda29afb7
--- /dev/null
+++ b/modules/asn1-ber/Makefile
@@ -0,0 +1,11 @@
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+include $(GOROOT)/src/Make.inc
+
+TARG=github.com/mmitton/asn1-ber
+GOFILES=\
+ ber.go\
+
+include $(GOROOT)/src/Make.pkg
diff --git a/modules/asn1-ber/README b/modules/asn1-ber/README
new file mode 100644
index 0000000000..bb785a06fc
--- /dev/null
+++ b/modules/asn1-ber/README
@@ -0,0 +1,14 @@
+ASN1 BER Encoding / Decoding Library for the GO programming language.
+
+Required Librarys:
+ None
+
+Working:
+ Very basic encoding / decoding needed for LDAP protocol
+
+Tests Implemented:
+ None
+
+TODO:
+ Fix all encoding / decoding to conform to ASN1 BER spec
+ Implement Tests / Benchmarks
diff --git a/modules/asn1-ber/ber.go b/modules/asn1-ber/ber.go
new file mode 100644
index 0000000000..3e99a273c6
--- /dev/null
+++ b/modules/asn1-ber/ber.go
@@ -0,0 +1,492 @@
+package ber
+
+import (
+ "bytes"
+ "fmt"
+ "io"
+ "reflect"
+)
+
+type Packet struct {
+ ClassType uint8
+ TagType uint8
+ Tag uint8
+ Value interface{}
+ ByteValue []byte
+ Data *bytes.Buffer
+ Children []*Packet
+ Description string
+}
+
+const (
+ TagEOC = 0x00
+ TagBoolean = 0x01
+ TagInteger = 0x02
+ TagBitString = 0x03
+ TagOctetString = 0x04
+ TagNULL = 0x05
+ TagObjectIdentifier = 0x06
+ TagObjectDescriptor = 0x07
+ TagExternal = 0x08
+ TagRealFloat = 0x09
+ TagEnumerated = 0x0a
+ TagEmbeddedPDV = 0x0b
+ TagUTF8String = 0x0c
+ TagRelativeOID = 0x0d
+ TagSequence = 0x10
+ TagSet = 0x11
+ TagNumericString = 0x12
+ TagPrintableString = 0x13
+ TagT61String = 0x14
+ TagVideotexString = 0x15
+ TagIA5String = 0x16
+ TagUTCTime = 0x17
+ TagGeneralizedTime = 0x18
+ TagGraphicString = 0x19
+ TagVisibleString = 0x1a
+ TagGeneralString = 0x1b
+ TagUniversalString = 0x1c
+ TagCharacterString = 0x1d
+ TagBMPString = 0x1e
+ TagBitmask = 0x1f // xxx11111b
+)
+
+var TagMap = map[uint8]string{
+ TagEOC: "EOC (End-of-Content)",
+ TagBoolean: "Boolean",
+ TagInteger: "Integer",
+ TagBitString: "Bit String",
+ TagOctetString: "Octet String",
+ TagNULL: "NULL",
+ TagObjectIdentifier: "Object Identifier",
+ TagObjectDescriptor: "Object Descriptor",
+ TagExternal: "External",
+ TagRealFloat: "Real (float)",
+ TagEnumerated: "Enumerated",
+ TagEmbeddedPDV: "Embedded PDV",
+ TagUTF8String: "UTF8 String",
+ TagRelativeOID: "Relative-OID",
+ TagSequence: "Sequence and Sequence of",
+ TagSet: "Set and Set OF",
+ TagNumericString: "Numeric String",
+ TagPrintableString: "Printable String",
+ TagT61String: "T61 String",
+ TagVideotexString: "Videotex String",
+ TagIA5String: "IA5 String",
+ TagUTCTime: "UTC Time",
+ TagGeneralizedTime: "Generalized Time",
+ TagGraphicString: "Graphic String",
+ TagVisibleString: "Visible String",
+ TagGeneralString: "General String",
+ TagUniversalString: "Universal String",
+ TagCharacterString: "Character String",
+ TagBMPString: "BMP String",
+}
+
+const (
+ ClassUniversal = 0 // 00xxxxxxb
+ ClassApplication = 64 // 01xxxxxxb
+ ClassContext = 128 // 10xxxxxxb
+ ClassPrivate = 192 // 11xxxxxxb
+ ClassBitmask = 192 // 11xxxxxxb
+)
+
+var ClassMap = map[uint8]string{
+ ClassUniversal: "Universal",
+ ClassApplication: "Application",
+ ClassContext: "Context",
+ ClassPrivate: "Private",
+}
+
+const (
+ TypePrimitive = 0 // xx0xxxxxb
+ TypeConstructed = 32 // xx1xxxxxb
+ TypeBitmask = 32 // xx1xxxxxb
+)
+
+var TypeMap = map[uint8]string{
+ TypePrimitive: "Primative",
+ TypeConstructed: "Constructed",
+}
+
+var Debug bool = false
+
+func PrintBytes(buf []byte, indent string) {
+ data_lines := make([]string, (len(buf)/30)+1)
+ num_lines := make([]string, (len(buf)/30)+1)
+
+ for i, b := range buf {
+ data_lines[i/30] += fmt.Sprintf("%02x ", b)
+ num_lines[i/30] += fmt.Sprintf("%02d ", (i+1)%100)
+ }
+
+ for i := 0; i < len(data_lines); i++ {
+ fmt.Print(indent + data_lines[i] + "\n")
+ fmt.Print(indent + num_lines[i] + "\n\n")
+ }
+}
+
+func PrintPacket(p *Packet) {
+ printPacket(p, 0, false)
+}
+
+func printPacket(p *Packet, indent int, printBytes bool) {
+ indent_str := ""
+
+ for len(indent_str) != indent {
+ indent_str += " "
+ }
+
+ class_str := ClassMap[p.ClassType]
+
+ tagtype_str := TypeMap[p.TagType]
+
+ tag_str := fmt.Sprintf("0x%02X", p.Tag)
+
+ if p.ClassType == ClassUniversal {
+ tag_str = TagMap[p.Tag]
+ }
+
+ value := fmt.Sprint(p.Value)
+ description := ""
+
+ if p.Description != "" {
+ description = p.Description + ": "
+ }
+
+ fmt.Printf("%s%s(%s, %s, %s) Len=%d %q\n", indent_str, description, class_str, tagtype_str, tag_str, p.Data.Len(), value)
+
+ if printBytes {
+ PrintBytes(p.Bytes(), indent_str)
+ }
+
+ for _, child := range p.Children {
+ printPacket(child, indent+1, printBytes)
+ }
+}
+
+func resizeBuffer(in []byte, new_size uint64) (out []byte) {
+ out = make([]byte, new_size)
+
+ copy(out, in)
+
+ return
+}
+
+func readBytes(reader io.Reader, buf []byte) error {
+ idx := 0
+ buflen := len(buf)
+
+ for idx < buflen {
+ n, err := reader.Read(buf[idx:])
+ if err != nil {
+ return err
+ }
+ idx += n
+ }
+
+ return nil
+}
+
+func ReadPacket(reader io.Reader) (*Packet, error) {
+ buf := make([]byte, 2)
+
+ err := readBytes(reader, buf)
+
+ if err != nil {
+ return nil, err
+ }
+
+ idx := uint64(2)
+ datalen := uint64(buf[1])
+
+ if Debug {
+ fmt.Printf("Read: datalen = %d len(buf) = %d ", datalen, len(buf))
+
+ for _, b := range buf {
+ fmt.Printf("%02X ", b)
+ }
+
+ fmt.Printf("\n")
+ }
+
+ if datalen&128 != 0 {
+ a := datalen - 128
+
+ idx += a
+ buf = resizeBuffer(buf, 2+a)
+
+ err := readBytes(reader, buf[2:])
+
+ if err != nil {
+ return nil, err
+ }
+
+ datalen = DecodeInteger(buf[2 : 2+a])
+
+ if Debug {
+ fmt.Printf("Read: a = %d idx = %d datalen = %d len(buf) = %d", a, idx, datalen, len(buf))
+
+ for _, b := range buf {
+ fmt.Printf("%02X ", b)
+ }
+
+ fmt.Printf("\n")
+ }
+ }
+
+ buf = resizeBuffer(buf, idx+datalen)
+ err = readBytes(reader, buf[idx:])
+
+ if err != nil {
+ return nil, err
+ }
+
+ if Debug {
+ fmt.Printf("Read: len( buf ) = %d idx=%d datalen=%d idx+datalen=%d\n", len(buf), idx, datalen, idx+datalen)
+
+ for _, b := range buf {
+ fmt.Printf("%02X ", b)
+ }
+ }
+
+ p := DecodePacket(buf)
+
+ return p, nil
+}
+
+func DecodeString(data []byte) (ret string) {
+ for _, c := range data {
+ ret += fmt.Sprintf("%c", c)
+ }
+
+ return
+}
+
+func DecodeInteger(data []byte) (ret uint64) {
+ for _, i := range data {
+ ret = ret * 256
+ ret = ret + uint64(i)
+ }
+
+ return
+}
+
+func EncodeInteger(val uint64) []byte {
+ var out bytes.Buffer
+
+ found := false
+
+ shift := uint(56)
+
+ mask := uint64(0xFF00000000000000)
+
+ for mask > 0 {
+ if !found && (val&mask != 0) {
+ found = true
+ }
+
+ if found || (shift == 0) {
+ out.Write([]byte{byte((val & mask) >> shift)})
+ }
+
+ shift -= 8
+ mask = mask >> 8
+ }
+
+ return out.Bytes()
+}
+
+func DecodePacket(data []byte) *Packet {
+ p, _ := decodePacket(data)
+
+ return p
+}
+
+func decodePacket(data []byte) (*Packet, []byte) {
+ if Debug {
+ fmt.Printf("decodePacket: enter %d\n", len(data))
+ }
+
+ p := new(Packet)
+
+ p.ClassType = data[0] & ClassBitmask
+ p.TagType = data[0] & TypeBitmask
+ p.Tag = data[0] & TagBitmask
+
+ datalen := DecodeInteger(data[1:2])
+ datapos := uint64(2)
+
+ if datalen&128 != 0 {
+ datalen -= 128
+ datapos += datalen
+ datalen = DecodeInteger(data[2 : 2+datalen])
+ }
+
+ p.Data = new(bytes.Buffer)
+
+ p.Children = make([]*Packet, 0, 2)
+
+ p.Value = nil
+
+ value_data := data[datapos : datapos+datalen]
+
+ if p.TagType == TypeConstructed {
+ for len(value_data) != 0 {
+ var child *Packet
+
+ child, value_data = decodePacket(value_data)
+ p.AppendChild(child)
+ }
+ } else if p.ClassType == ClassUniversal {
+ p.Data.Write(data[datapos : datapos+datalen])
+ p.ByteValue = value_data
+
+ switch p.Tag {
+ case TagEOC:
+ case TagBoolean:
+ val := DecodeInteger(value_data)
+
+ p.Value = val != 0
+ case TagInteger:
+ p.Value = DecodeInteger(value_data)
+ case TagBitString:
+ case TagOctetString:
+ p.Value = DecodeString(value_data)
+ case TagNULL:
+ case TagObjectIdentifier:
+ case TagObjectDescriptor:
+ case TagExternal:
+ case TagRealFloat:
+ case TagEnumerated:
+ p.Value = DecodeInteger(value_data)
+ case TagEmbeddedPDV:
+ case TagUTF8String:
+ case TagRelativeOID:
+ case TagSequence:
+ case TagSet:
+ case TagNumericString:
+ case TagPrintableString:
+ p.Value = DecodeString(value_data)
+ case TagT61String:
+ case TagVideotexString:
+ case TagIA5String:
+ case TagUTCTime:
+ case TagGeneralizedTime:
+ case TagGraphicString:
+ case TagVisibleString:
+ case TagGeneralString:
+ case TagUniversalString:
+ case TagCharacterString:
+ case TagBMPString:
+ }
+ } else {
+ p.Data.Write(data[datapos : datapos+datalen])
+ }
+
+ return p, data[datapos+datalen:]
+}
+
+func (p *Packet) DataLength() uint64 {
+ return uint64(p.Data.Len())
+}
+
+func (p *Packet) Bytes() []byte {
+ var out bytes.Buffer
+
+ out.Write([]byte{p.ClassType | p.TagType | p.Tag})
+ packet_length := EncodeInteger(p.DataLength())
+
+ if p.DataLength() > 127 || len(packet_length) > 1 {
+ out.Write([]byte{byte(len(packet_length) | 128)})
+ out.Write(packet_length)
+ } else {
+ out.Write(packet_length)
+ }
+
+ out.Write(p.Data.Bytes())
+
+ return out.Bytes()
+}
+
+func (p *Packet) AppendChild(child *Packet) {
+ p.Data.Write(child.Bytes())
+
+ if len(p.Children) == cap(p.Children) {
+ newChildren := make([]*Packet, cap(p.Children)*2)
+
+ copy(newChildren, p.Children)
+ p.Children = newChildren[0:len(p.Children)]
+ }
+
+ p.Children = p.Children[0 : len(p.Children)+1]
+ p.Children[len(p.Children)-1] = child
+}
+
+func Encode(ClassType, TagType, Tag uint8, Value interface{}, Description string) *Packet {
+ p := new(Packet)
+
+ p.ClassType = ClassType
+ p.TagType = TagType
+ p.Tag = Tag
+ p.Data = new(bytes.Buffer)
+
+ p.Children = make([]*Packet, 0, 2)
+
+ p.Value = Value
+ p.Description = Description
+
+ if Value != nil {
+ v := reflect.ValueOf(Value)
+
+ if ClassType == ClassUniversal {
+ switch Tag {
+ case TagOctetString:
+ sv, ok := v.Interface().(string)
+
+ if ok {
+ p.Data.Write([]byte(sv))
+ }
+ }
+ }
+ }
+
+ return p
+}
+
+func NewSequence(Description string) *Packet {
+ return Encode(ClassUniversal, TypePrimitive, TagSequence, nil, Description)
+}
+
+func NewBoolean(ClassType, TagType, Tag uint8, Value bool, Description string) *Packet {
+ intValue := 0
+
+ if Value {
+ intValue = 1
+ }
+
+ p := Encode(ClassType, TagType, Tag, nil, Description)
+
+ p.Value = Value
+ p.Data.Write(EncodeInteger(uint64(intValue)))
+
+ return p
+}
+
+func NewInteger(ClassType, TagType, Tag uint8, Value uint64, Description string) *Packet {
+ p := Encode(ClassType, TagType, Tag, nil, Description)
+
+ p.Value = Value
+ p.Data.Write(EncodeInteger(Value))
+
+ return p
+}
+
+func NewString(ClassType, TagType, Tag uint8, Value, Description string) *Packet {
+ p := Encode(ClassType, TagType, Tag, nil, Description)
+
+ p.Value = Value
+ p.Data.Write([]byte(Value))
+
+ return p
+}
diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go
index e27e5133ed..79b59519e2 100644
--- a/modules/auth/ldap/ldap.go
+++ b/modules/auth/ldap/ldap.go
@@ -9,8 +9,8 @@ package ldap
import (
"fmt"
+ "github.com/gogits/gogs/modules/ldap"
"github.com/gogits/gogs/modules/log"
- goldap "github.com/juju2013/goldap"
)
// Basic LDAP authentication service
@@ -68,9 +68,9 @@ func (ls Ldapsource) SearchEntry(name, passwd string) (string, bool) {
return "", false
}
- search := goldap.NewSearchRequest(
+ search := ldap.NewSearchRequest(
ls.BaseDN,
- goldap.ScopeWholeSubtree, goldap.NeverDerefAliases, 0, 0, false,
+ ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
fmt.Sprintf(ls.Filter, name),
[]string{ls.Attributes},
nil)
@@ -87,10 +87,10 @@ func (ls Ldapsource) SearchEntry(name, passwd string) (string, bool) {
return "", true
}
-func ldapDial(ls Ldapsource) (*goldap.Conn, error) {
+func ldapDial(ls Ldapsource) (*ldap.Conn, error) {
if ls.UseSSL {
- return goldap.DialTLS("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port), nil)
+ return ldap.DialTLS("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port), nil)
} else {
- return goldap.Dial("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port))
+ return ldap.Dial("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port))
}
}
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 3eb0cbc564..233f7b1063 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -20,7 +20,7 @@ import (
type CreateRepoForm struct {
Uid int64 `form:"uid" binding:"Required"`
- RepoName string `form:"repo_name" binding:"Required;AlphaDash;MaxSize(100)"`
+ RepoName string `form:"repo_name" binding:"Required;AlphaDashDot;MaxSize(100)"`
Private bool `form:"private"`
Description string `form:"desc" binding:"MaxSize(255)"`
Gitignore string `form:"gitignore"`
@@ -33,11 +33,11 @@ func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs *binding.Errors, l
}
type MigrateRepoForm struct {
- HttpsUrl string `form:"url" binding:"Url"`
+ HttpsUrl string `form:"url" binding:"Required;Url"`
AuthUserName string `form:"auth_username"`
AuthPasswd string `form:"auth_password"`
Uid int64 `form:"uid" binding:"Required"`
- RepoName string `form:"repo_name" binding:"Required;AlphaDash;MaxSize(100)"`
+ RepoName string `form:"repo_name" binding:"Required;AlphaDashDot;MaxSize(100)"`
Mirror bool `form:"mirror"`
Private bool `form:"private"`
Description string `form:"desc" binding:"MaxSize(255)"`
@@ -48,7 +48,7 @@ func (f *MigrateRepoForm) Validate(ctx *macaron.Context, errs *binding.Errors, l
}
type RepoSettingForm struct {
- RepoName string `form:"repo_name" binding:"Required;AlphaDash;MaxSize(100)"`
+ RepoName string `form:"repo_name" binding:"Required;AlphaDashDot;MaxSize(100)"`
Description string `form:"desc" binding:"MaxSize(255)"`
Website string `form:"site" binding:"Url;MaxSize(100)"`
Branch string `form:"branch"`
@@ -69,17 +69,31 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs *binding.Errors, l
// \/ \/ \/ \/ \/ \/
type NewWebhookForm struct {
- PayloadUrl string `form:"payload_url" binding:"Required;Url"`
- ContentType string `form:"content_type" binding:"Required"`
- Secret string `form:"secret"`
- PushOnly bool `form:"push_only"`
- Active bool `form:"active"`
+ HookTaskType string `form:"hook_type" binding:"Required"`
+ PayloadUrl string `form:"payload_url" binding:"Required;Url"`
+ ContentType string `form:"content_type" binding:"Required"`
+ Secret string `form:"secret"`
+ PushOnly bool `form:"push_only"`
+ Active bool `form:"active"`
}
func (f *NewWebhookForm) Validate(ctx *macaron.Context, errs *binding.Errors, l i18n.Locale) {
validate(errs, ctx.Data, f, l)
}
+type NewSlackHookForm struct {
+ HookTaskType string `form:"hook_type" binding:"Required"`
+ Domain string `form:"domain" binding:"Required`
+ Token string `form:"token" binding:"Required"`
+ Channel string `form:"channel" binding:"Required"`
+ PushOnly bool `form:"push_only"`
+ Active bool `form:"active"`
+}
+
+func (f *NewSlackHookForm) Validate(ctx *macaron.Context, errs *binding.Errors, l i18n.Locale) {
+ validate(errs, ctx.Data, f, l)
+}
+
// .___
// | | ______ ________ __ ____
// | |/ ___// ___/ | \_/ __ \
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go
index 51a07b9128..93bd01a9fd 100644
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -13,24 +13,25 @@ import (
type InstallForm struct {
Database string `form:"database" binding:"Required"`
- Host string `form:"host"`
- User string `form:"user"`
- Passwd string `form:"passwd"`
+ DbHost string `form:"host"`
+ DbUser string `form:"user"`
+ DbPasswd string `form:"passwd"`
DatabaseName string `form:"database_name"`
SslMode string `form:"ssl_mode"`
DatabasePath string `form:"database_path"`
- RepoRootPath string `form:"repo_path"`
- RunUser string `form:"run_user"`
- Domain string `form:"domain"`
- AppUrl string `form:"app_url"`
- AdminName string `form:"admin_name" binding:"Required;AlphaDashDot;MaxSize(30)"`
- AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(255)"`
- AdminEmail string `form:"admin_email" binding:"Required;Email;MaxSize(50)"`
+ RepoRootPath string `form:"repo_path" binding:"Required"`
+ RunUser string `form:"run_user" binding:"Required"`
+ Domain string `form:"domain" binding:"Required"`
+ AppUrl string `form:"app_url" binding:"Required"`
SmtpHost string `form:"smtp_host"`
SmtpEmail string `form:"mailer_user"`
SmtpPasswd string `form:"mailer_pwd"`
RegisterConfirm string `form:"register_confirm"`
MailNotify string `form:"mail_notify"`
+ AdminName string `form:"admin_name" binding:"Required;AlphaDashDot;MaxSize(30)"`
+ AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(255)"`
+ ConfirmPasswd string `form:"confirm_passwd" binding:"Required;MinSize(6);MaxSize(255)"`
+ AdminEmail string `form:"admin_email" binding:"Required;Email;MaxSize(50)"`
}
func (f *InstallForm) Validate(ctx *macaron.Context, errs *binding.Errors, l i18n.Locale) {
diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index b8bd33e113..a3db15df1a 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -14,6 +14,7 @@ import (
"strings"
"github.com/gogits/gfm"
+ "github.com/gogits/gogs/modules/setting"
)
func isletter(c byte) bool {
@@ -112,7 +113,7 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string) []byte {
ms := MentionPattern.FindAll(line, -1)
for _, m := range ms {
line = bytes.Replace(line, m,
- []byte(fmt.Sprintf(`%s`, m[1:], m)), -1)
+ []byte(fmt.Sprintf(`%s`, setting.AppSubUrl, m[1:], m)), -1)
}
}
diff --git a/modules/base/template.go b/modules/base/template.go
index f2ae00b915..b1c8c161d3 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -8,13 +8,16 @@ import (
"bytes"
"container/list"
"encoding/json"
+ "errors"
"fmt"
"html/template"
"runtime"
"strings"
"time"
+ "github.com/gogits/gogs/modules/mahonia"
"github.com/gogits/gogs/modules/setting"
+ "github.com/saintfish/chardet"
)
func Str2html(raw string) template.HTML {
@@ -45,6 +48,29 @@ func ShortSha(sha1 string) string {
return sha1
}
+func ToUtf8WithErr(content []byte) (error, string) {
+ detector := chardet.NewTextDetector()
+ result, err := detector.DetectBest(content)
+ if err != nil {
+ return err, ""
+ }
+
+ if result.Charset == "utf8" {
+ return nil, string(content)
+ }
+
+ decoder := mahonia.NewDecoder(result.Charset)
+ if decoder != nil {
+ return nil, decoder.ConvertString(string(content))
+ }
+ return errors.New("unknow char decoder"), string(content)
+}
+
+func ToUtf8(content string) string {
+ _, res := ToUtf8WithErr([]byte(content))
+ return res
+}
+
var mailDomains = map[string]string{
"gmail.com": "gmail.com",
}
@@ -56,6 +82,9 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
"AppName": func() string {
return setting.AppName
},
+ "AppSubUrl": func() string {
+ return setting.AppSubUrl
+ },
"AppVer": func() string {
return setting.AppVer
},
@@ -103,6 +132,7 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
"ActionContent2Commits": ActionContent2Commits,
"Oauth2Icon": Oauth2Icon,
"Oauth2Name": Oauth2Name,
+ "ToUtf8": ToUtf8,
}
type Actioner interface {
@@ -119,14 +149,12 @@ type Actioner interface {
// and returns a icon class name.
func ActionIcon(opType int) string {
switch opType {
- case 1: // Create repository.
+ case 1, 8: // Create, transfer repository.
return "repo"
case 5, 9: // Commit repository.
return "git-commit"
case 6: // Create issue.
return "issue-opened"
- case 8: // Transfer repository.
- return "share"
case 10: // Comment issue.
return "comment"
default:
@@ -134,16 +162,16 @@ func ActionIcon(opType int) string {
}
}
-// TODO: Legacy
+// FIXME: Legacy
const (
- TPL_CREATE_REPO = `%s created repository %s`
- TPL_COMMIT_REPO = `%s pushed to %s at %s%s`
- TPL_COMMIT_REPO_LI = `
eryx + 7 days ago + + owner + + + +
+