diff options
| -rw-r--r-- | .gopmfile | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README_ZH.md | 2 | ||||
| -rw-r--r-- | conf/locale/TRANSLATORS | 3 | ||||
| -rw-r--r-- | models/issue.go | 6 | ||||
| -rw-r--r-- | routers/repo/repo.go | 2 | ||||
| -rw-r--r-- | scripts/launchd/io.gogs.web.plist | 39 | ||||
| -rw-r--r-- | templates/repo/view_list.tmpl | 2 |
8 files changed, 51 insertions, 7 deletions
@@ -17,7 +17,7 @@ github.com/go-sql-driver/mysql = commit:d512f20 github.com/go-xorm/core = commit:acb6f00 github.com/go-xorm/xorm = commit:a8fba4d github.com/gogits/chardet = commit:2404f77725 -github.com/gogits/git-module = commit:5cd57b9 +github.com/gogits/git-module = github.com/gogits/go-gogs-client = commit:78460e9 github.com/issue9/identicon = commit:f8c0d2c github.com/kardianos/minwinsvc = commit:cad6b2b @@ -103,6 +103,8 @@ There are 5 ways to install Gogs: - [Fabric8](http://fabric8.io/) (DevOps) - [Taiga](https://taiga.io/) (Project Management) - [Puppet](https://forge.puppetlabs.com/Siteminds/gogs) (IT) +- [Kanboard](http://kanboard.net/plugin/gogs-webhook) (Project Management) +- [BearyChat](https://bearychat.com/) (Team Communication) ### Product Support diff --git a/README_ZH.md b/README_ZH.md index 4c31fd4224..9ab4889141 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -74,6 +74,8 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自 - [Fabric8](http://fabric8.io/)（DevOps） - [Taiga](https://taiga.io/)（项目管理） - [Puppet](https://forge.puppetlabs.com/Siteminds/gogs)（IT） +- [Kanboard](http://kanboard.net/plugin/gogs-webhook)（项目管理） +- [BearyChat](https://bearychat.com/)（团队交流） ### 产品支持 diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index 27c1802db7..616a1dc329 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -10,6 +10,7 @@ Alexander Steinhöfer <kontakt AT lx-s DOT de> Alexandre Magno <alexandre DOT mbm AT gmail DOT com> Andrey Nering <andrey AT nering DOT com DOT br> Andrey Solomatin <toadron AT yandex DOT ru> +Antoine GIRARD <sapk AT sapk DOT fr> Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com> Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com> Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com> @@ -21,7 +22,7 @@ Ezequiel Gonzalez Rial <gonrial AT gmail DOT com> Gregor Santner <gdev AT live DOT de> Hamid Feizabadi <hamidfzm AT gmail DOT com> Huimin Wang <wanghm2009 AT hotmail DOT co DOT jp> -ilko +ilko <kontact-mr.k AT outlook DOT com"> Ilya Makarov Juraj Bubniak <contact AT jbub DOT eu> Lafriks <lafriks AT gmail DOT com> diff --git a/models/issue.go b/models/issue.go index 22ea72512c..6188da5c63 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1595,13 +1595,13 @@ func createComment(e *xorm.Session, u *User, repo *Repository, issue *Issue, com // Notify watchers. act := &Action{ ActUserID: u.Id, - ActUserName: u.LowerName, + ActUserName: u.Name, ActEmail: u.Email, OpType: COMMENT_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]), RepoID: repo.ID, - RepoUserName: repo.Owner.LowerName, - RepoName: repo.LowerName, + RepoUserName: repo.Owner.Name, + RepoName: repo.Name, IsPrivate: repo.IsPrivate, } if err = notifyWatchers(e, act); err != nil { diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 43672ff107..d60ec68834 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -330,5 +330,5 @@ func Download(ctx *middleware.Context) { } } - ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+base.ShortSha(commit.ID.String())+ext) + ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+refName+ext) } diff --git a/scripts/launchd/io.gogs.web.plist b/scripts/launchd/io.gogs.web.plist new file mode 100644 index 0000000000..2a5ec7d691 --- /dev/null +++ b/scripts/launchd/io.gogs.web.plist @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>Label</key> + <string>io.gogs.web</string> + <!-- assumes Gogs is running under 'git' account --> + <!-- modify below to reflect your settings --> + <key>UserName</key> + <string>git</string> + <key>GroupName</key> + <string>git</string> + <key>ProgramArguments</key> + <array> + <!-- assumes Gogs is installed in /Users/git/gogs --> + <!-- modify below to reflect your settings --> + <string>/Users/git/gogs/gogs</string> + <string>web</string> + </array> + <key>RunAtLoad</key> + <true/> + <key>KeepAlive</key> + <true/> + <!-- assumes Gogs is installed in /Users/git/gogs --> + <!-- modify below to reflect your settings --> + <key>WorkingDirectory</key> + <string>/Users/git/gogs/</string> + <key>StandardOutPath</key> + <string>/Users/git/gogs/log/stdout.log</string> + <key>StandardErrorPath</key> + <string>/Users/git/gogs/log/stderr.log</string> + <!-- default 256 is too low for Gogs needs using parallel pipes --> + <key>SoftResourceLimits</key> + <dict> + <key>NumberOfFiles</key> + <integer>8192</integer> + </dict> + </dict> +</plist> diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index d88d7b5597..b3dee5610f 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -31,7 +31,7 @@ <td> <span class="icon octicon octicon-file-submodule"></span> {{if $commit.RefUrl AppUrl}} - <a href="{{$commit.RefUrl}}">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a> + <a href="{{$commit.RefUrl AppUrl}}">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl AppUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a> {{else}} {{$entry.Name}} @ {{ShortSha $commit.RefId}} {{end}} |