From 645d4d0c5bd283003d922400232bcff0f5bf8836 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Mon, 7 Sep 2015 05:57:19 -0400
Subject: [PATCH] #1594 Collaborative Repositories missing suburl on Dashboard
---
gogs.go | 2 +-
models/models_tidb.go | 2 +-
modules/base/template.go | 2 +-
templates/.VERSION | 2 +-
templates/user/dashboard/dashboard.tmpl | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gogs.go b/gogs.go
index 94e8bb524c43..32b9c785a4fc 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.6.9.0906 Beta"
+const APP_VER = "0.6.9.0907 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/models_tidb.go b/models/models_tidb.go
index 20d9819706ae..d99884e9e818 100644
--- a/models/models_tidb.go
+++ b/models/models_tidb.go
@@ -1,4 +1,4 @@
-// +build tidb
+// +build tidb go1.4.2
// Copyright 2015 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
diff --git a/modules/base/template.go b/modules/base/template.go
index f86a97b3b299..6fc449a6a6ae 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -77,7 +77,7 @@ func ToUtf8WithErr(content []byte) (error, string) {
encoding, _ := charset.Lookup(charsetLabel)
if encoding == nil {
- return fmt.Errorf("unknow char decoder %s", charsetLabel), string(content)
+ return fmt.Errorf("unknown char decoder %s", charsetLabel), string(content)
}
result, n, err := transform.String(encoding.NewDecoder(), string(content))
diff --git a/templates/.VERSION b/templates/.VERSION
index e9914c880abb..41e2b2e2da00 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.9.0906 Beta
\ No newline at end of file
+0.6.9.0907 Beta
\ No newline at end of file
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 02c0102e42f0..e530b6f7359c 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -59,7 +59,7 @@
<ul class="list-no-style">
{{range .CollaborativeRepos}}
<li {{if .IsPrivate}}class="private"{{end}}>
- <a href="{{.Owner.Name}}/{{.Name}}">
+ <a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">
<i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
<span class="repo-name">
<span class="repo-name-prefix">{{.Owner.Name}} / </span>