summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-28 21:53:40 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-28 21:53:40 -0400
commit2401e68d7ed7d53425293ad32d231542d03bbef3 (patch)
treec57bd73e14c98e42857eadb29a2151cd2562c64a
parent31805e2bbea17d5fc3806f472ddab42736e7b4a1 (diff)
downloadgitea-2401e68d7ed7d53425293ad32d231542d03bbef3.tar.gz
gitea-2401e68d7ed7d53425293ad32d231542d03bbef3.zip
Prepare for v0.3.1 hotfix
-rw-r--r--README.md2
-rw-r--r--README_ZH.md2
-rw-r--r--gogs.go2
-rw-r--r--public/img/favicon.bak.pngbin0 -> 15949 bytes
-rw-r--r--public/img/favicon.pngbin15949 -> 10889 bytes
-rw-r--r--routers/repo/commit.go1
-rw-r--r--templates/repo/diff.tmpl4
7 files changed, 5 insertions, 6 deletions
diff --git a/README.md b/README.md
index d188508ec6..c16f721aa6 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
![Demo](http://gowalker.org/public/gogs_demo.gif)
-##### Current version: 0.3.0 Alpha
+##### Current version: 0.3.1 Alpha
### NOTICES
diff --git a/README_ZH.md b/README_ZH.md
index bbf461ddf6..b827822357 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
![Demo](http://gowalker.org/public/gogs_demo.gif)
-##### 当前版本:0.3.0 Alpha
+##### 当前版本:0.3.1 Alpha
## 开发目的
diff --git a/gogs.go b/gogs.go
index 1a8b4d1312..d723aa33a0 100644
--- a/gogs.go
+++ b/gogs.go
@@ -19,7 +19,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.3.0.0427 Alpha"
+const APP_VER = "0.3.1.0427 Alpha"
func init() {
base.AppVer = APP_VER
diff --git a/public/img/favicon.bak.png b/public/img/favicon.bak.png
new file mode 100644
index 0000000000..ba9bd03756
--- /dev/null
+++ b/public/img/favicon.bak.png
Binary files differ
diff --git a/public/img/favicon.png b/public/img/favicon.png
index ba9bd03756..87282f9a78 100644
--- a/public/img/favicon.png
+++ b/public/img/favicon.png
Binary files differ
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index d73669923b..bc33fe4473 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -97,6 +97,7 @@ func Diff(ctx *middleware.Context, params martini.Params) {
parents[i] = sha.String()
if err != nil {
ctx.Handle(404, "repo.Diff", err)
+ return
}
}
diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl
index 38fe3fee2c..0b6d4f722e 100644
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -8,13 +8,11 @@
<a class="pull-right btn btn-primary btn-sm" rel="nofollow" href="{{.SourcePath}}">Browse Source</a>
<h4>{{.Commit.Message}}</h4>
</div>
- {{ $username := .Username }}
- {{ $reponame := .Reponame }}
<div class="panel-body">
<span class="pull-right">
<ul class="list-unstyled">
{{range .Parents}}
- <li>parent <a href="/{{$username}}/{{$reponame}}/commit/{{.}}"><span class="label label-default sha">{{ShortSha .}}</span></a></li>
+ <li>parent <a href="{{$.RepoLink}}/commit/{{.}}"><span class="label label-default sha">{{ShortSha .}}</span></a></li>
{{end}}
<li>commit <span class="label label-default sha">{{ShortSha .CommitId}}</span></li>
</ul>