summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-28 09:06:48 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-28 09:06:48 -0400
commit76b864234857ec01613db78ed19868a91795e99b (patch)
tree45355600d2ee7a1d439a37116487fda3087d5aaa
parentcb05b8325cdd85dda9bbebf61d8993da34d80e70 (diff)
downloadgitea-76b864234857ec01613db78ed19868a91795e99b.tar.gz
gitea-76b864234857ec01613db78ed19868a91795e99b.zip
Bug fix
-rw-r--r--models/repo.go1
-rw-r--r--routers/install.go1
-rw-r--r--templates/install.tmpl10
3 files changed, 12 insertions, 0 deletions
diff --git a/models/repo.go b/models/repo.go
index 726d435d33..4be655d287 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 b44b89034e..e0ac92f130 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 aace5e8a85..be5a69186d 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/>