summaryrefslogtreecommitdiffstats
path: root/cmd/web.go
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-02-08 21:26:14 -0500
committerUnknwon <joe2010xtmf@163.com>2015-02-08 21:26:14 -0500
commitf15fa9167ade8262bed437451585d319f12d1182 (patch)
tree1f6e32e4377d0c09fd3a57a66caf5098e0c16c97 /cmd/web.go
parentcd0ee35b3f887cc4ab6ba16cc2d955bfae607678 (diff)
downloadgitea-f15fa9167ade8262bed437451585d319f12d1182.tar.gz
gitea-f15fa9167ade8262bed437451585d319f12d1182.zip
cmd: code fix for #905
- routers/admin: add rewrite update hook operation - conf/locale: update locale file due to ini behavior changes - cmd/cert_stub.go: remove useless code - cmd/fix.go: no longer need fix command(at least now)
Diffstat (limited to 'cmd/web.go')
-rw-r--r--cmd/web.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/web.go b/cmd/web.go
index ceb2134447..3284acb9df 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -55,7 +55,7 @@ and it takes care of all the other things for you`,
Action: runWeb,
Flags: []cli.Flag{
cli.StringFlag{"port, p", "3000", "Temporary port number to prevent conflict", ""},
- cli.StringFlag{"config, c", "custom/conf/app.ini", "Configuration file", ""},
+ cli.StringFlag{"config, c", "custom/conf/app.ini", "Custom configuration file path", ""},
},
}
@@ -166,11 +166,12 @@ func newMacaron() *macaron.Macaron {
}
func runWeb(ctx *cli.Context) {
+ checkVersion()
+
if ctx.IsSet("config") {
setting.CustomConf = ctx.String("config")
}
routers.GlobalInit()
- checkVersion()
m := newMacaron()