From 0fd754bbe0dab966ad3070dc24f9583c67c84513 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 28 Mar 2014 07:26:22 -0400
Subject: Working on install page

---
 models/models.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'models')

diff --git a/models/models.go b/models/models.go
index 813725be..04a361c5 100644
--- a/models/models.go
+++ b/models/models.go
@@ -34,7 +34,7 @@ func LoadModelsConfig() {
 	DbCfg.Path = base.Cfg.MustValue("database", "PATH", "data/gogs.db")
 }
 
-func setEngine() {
+func SetEngine() {
 	var err error
 	switch DbCfg.Type {
 	case "mysql":
@@ -70,7 +70,7 @@ func setEngine() {
 }
 
 func NewEngine() {
-	setEngine()
+	SetEngine()
 	if err := orm.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
 		new(Action), new(Access), new(Issue), new(Comment)); err != nil {
 		fmt.Printf("sync database struct error: %v\n", err)
-- 
cgit v1.2.3


From d800a44a26216747b1a60a21090c581dfbe23ff4 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Fri, 28 Mar 2014 19:34:01 +0800
Subject: display commits by sha1 id

---
 models/git.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'models')

diff --git a/models/git.go b/models/git.go
index e2ee5208..34f0267f 100644
--- a/models/git.go
+++ b/models/git.go
@@ -244,11 +244,11 @@ func GetCommitsByCommitId(userName, repoName, commitId string) (*list.List, erro
 	if err != nil {
 		return nil, err
 	}
-	r, err := repo.LookupReference(commitId)
+	oid, err := git.NewOidFromString(commitId)
 	if err != nil {
 		return nil, err
 	}
-	return r.AllCommits()
+	return repo.CommitsBefore(oid)
 }
 
 // Diff line types.
-- 
cgit v1.2.3


From 76b864234857ec01613db78ed19868a91795e99b Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Fri, 28 Mar 2014 09:06:48 -0400
Subject: Bug fix

---
 models/repo.go         |  1 +
 routers/install.go     |  1 +
 templates/install.tmpl | 10 ++++++++++
 3 files changed, 12 insertions(+)

(limited to 'models')

diff --git a/models/repo.go b/models/repo.go
index 726d435d..4be655d2 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -510,6 +510,7 @@ func NotifyWatchers(act *Action) error {
 			continue
 		}
 
+		act.Id = 0
 		act.UserId = watches[i].UserId
 		if _, err = orm.InsertOne(act); err != nil {
 			return errors.New("repo.NotifyWatchers(create action): " + err.Error())
diff --git a/routers/install.go b/routers/install.go
index b44b8903..e0ac92f1 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -22,6 +22,7 @@ func Install(ctx *middleware.Context) {
 	ctx.Data["DbCfg"] = models.DbCfg
 	ctx.Data["RepoRootPath"] = base.RepoRootPath
 	ctx.Data["RunUser"] = base.RunUser
+	ctx.Data["AppUrl"] = base.AppUrl
 	ctx.Data["PageIsInstall"] = true
 
 	if ctx.Req.Method == "GET" {
diff --git a/templates/install.tmpl b/templates/install.tmpl
index aace5e8a..be5a6918 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -83,6 +83,7 @@
                 <p class="help-block">The git copy of each repository is saved in this directory.</p>
             </div>
         </div>
+
         <div class="form-group">
             <label class="col-md-3 control-label">Run User: </label>
 
@@ -91,6 +92,15 @@
                 <p class="help-block">The user has access to visit and run Gogs.</p>
             </div>
         </div>
+        
+        <div class="form-group">
+            <label class="col-md-3 control-label">App URL: </label>
+
+            <div class="col-md-8">
+                <input name="app_url" type="text" class="form-control" placeholder="Type app root URL " value="{{.AppUrl}}" required="required">
+                <p class="help-block">This affects HTTP/HTTPS clone URL and somewhere in e-mail.</p>
+            </div>
+        </div>
 
         <hr/>
 
-- 
cgit v1.2.3


From d01820c125669367b7a585d767d5f11e73a701c2 Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sat, 29 Mar 2014 13:40:22 +0800
Subject: conf support mysql port

---
 conf/app.ini     | 2 +-
 models/models.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'models')

diff --git a/conf/app.ini b/conf/app.ini
index 05c7745f..abc27c39 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -20,7 +20,7 @@ HTTP_PORT = 3000
 [database]
 ; Either "mysql", "postgres" or "sqlite3"(binary release only), it's your choice
 DB_TYPE = mysql
-HOST = 
+HOST = 127.0.0.1:3306
 NAME = gogs
 USER = root
 PASSWD =
diff --git a/models/models.go b/models/models.go
index 04a361c5..bafa1747 100644
--- a/models/models.go
+++ b/models/models.go
@@ -38,7 +38,7 @@ func SetEngine() {
 	var err error
 	switch DbCfg.Type {
 	case "mysql":
-		orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@%s/%s?charset=utf8",
+		orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
 			DbCfg.User, DbCfg.Pwd, DbCfg.Host, DbCfg.Name))
 	case "postgres":
 		orm, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=%s",
-- 
cgit v1.2.3