Clean code

diff --git a/README.md b/README.md
index 526cc501b2be4859af9cbb0ecc933e00a59fae1e..0fb646e5e05afab09e32de34188bac87b49722f2 100644 (file)
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, devel
 
 ## Features
 
+- Activity timeline
 - SSH protocal support.
 - Register/delete account.
 - Create/delete public repository.

diff --git a/gogs.go b/gogs.go
index e826ab9f360024bc3a19bf046736b36efb8f8402..08421f0055e2e465c29c128835f3aff6abd641aa 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -7,7 +7,7 @@ package main
 
 import (
        "os"
-       "os/user"
+       // "os/user"
        "runtime"
 
        "github.com/codegangsta/cli"
@@ -27,14 +27,14 @@ func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())
 }
 
-func checkRunUser() bool {
-       u, err := user.Current()
-       if err != nil {
-               // TODO: log
-               return false
-       }
-       return u.Username == base.Cfg.MustValue("", "RUN_USER")
-}
+// func checkRunUser() bool {
+//     u, err := user.Current()
+//     if err != nil {
+//             // TODO: log
+//             return false
+//     }
+//     return u.Username == base.Cfg.MustValue("", "RUN_USER")
+// }
 
 func main() {
        /*if !checkRunUser() {
@@ -50,8 +50,6 @@ func main() {
                CmdWeb,
                CmdServ,
        }
-       app.Flags = append(app.Flags, []cli.Flag{
-               cli.BoolFlag{"noterm", "disable color output"},
-       }...)
+       app.Flags = append(app.Flags, []cli.Flag{}...)
        app.Run(os.Args)
 }

diff --git a/models/repo.go b/models/repo.go
index 125abfc3423b6da43334bcef995bc3ed93194fbd..56e286ec4abeef9fc76d013e521cf081b4ba6211 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -253,7 +253,7 @@ func GetRepositoryById(id int64) (repo *Repository, err error) {
 // GetRepositories returns the list of repositories of given user.
 func GetRepositories(user *User) ([]Repository, error) {
        repos := make([]Repository, 0, 10)
-       err := orm.Find(&repos, &Repository{OwnerId: user.Id})
+       err := orm.Desc("updated").Find(&repos, &Repository{OwnerId: user.Id})
        return repos, err
 }
 

diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 948713efe8281865d87d951000062483aa1e2ca5..8cdc6df718d5ef04ab8f8e1faa2446eee10b7743 100644 (file)
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -5,6 +5,8 @@
 package middleware
 
 import (
+       "errors"
+
        "github.com/codegangsta/martini"
 
        "github.com/gogits/gogs/models"
@@ -31,9 +33,7 @@ func RepoAssignment(redirect bool) martini.Handler {
                                        ctx.Render.Redirect("/")
                                        return
                                }
-                               //data["ErrorMsg"] = err
-                               //log.Error("repo.Single: %v", err)
-                               //r.HTML(200, "base/error", data)
+                               ctx.Handle(200, "RepoAssignment", err)
                                return
                        }
                } else {
@@ -45,9 +45,7 @@ func RepoAssignment(redirect bool) martini.Handler {
                                ctx.Render.Redirect("/")
                                return
                        }
-                       //data["ErrorMsg"] = "invliad user account for single repository"
-                       //log.Error("repo.Single: %v", err)
-                       //r.HTML(200, "base/error", data)
+                       ctx.Handle(200, "RepoAssignment", errors.New("invliad user account for single repository"))
                        return
                }
 
@@ -60,9 +58,7 @@ func RepoAssignment(redirect bool) martini.Handler {
                                ctx.Render.Redirect("/")
                                return
                        }
-                       //data["ErrorMsg"] = err
-                       //log.Error("repo.Single: %v", err)
-                       //r.HTML(200, "base/error", data)
+                       ctx.Handle(200, "RepoAssignment", err)
                        return
                }
 

diff --git a/serve.go b/serve.go
index 56105f2f806619d31446369f3457d04d2991dffe..68455de3d36e9aa4e52300228d7591abc2e56ada 100644 (file)
--- a/serve.go
+++ b/serve.go
@@ -58,7 +58,7 @@ func runServ(*cli.Context) {
 
        cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
        if cmd == "" {
-               println("Hi ", user.Name, "! You've successfully authenticated, but Gogs does not provide shell access.")
+               println("Hi", user.Name, "! You've successfully authenticated, but Gogs does not provide shell access.")
                return
        }
 

diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 93d33c8744c36fc40200b92d6c920d9eaacf92ad..2de92f515fddcf6c4d7ba777ded8d9124cac3125 100644 (file)
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -59,7 +59,7 @@
             <div class="col-md-8 col-md-offset-2">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" name="initReadme">
+                        <input type="checkbox" name="initReadme" {{if .initReadme}}checked{{end}}>
                         <strong>Initialize this repository with a README</strong>
                     </label>
                 </div>

diff --git a/web.go b/web.go
index 3f0e0ef7e23bc5ae0a7098ab89a553b7a8266e7c..b7138120a3fcb29ba7ab490a7d8b9393d4e3556c 100644 (file)
--- a/web.go
+++ b/web.go
@@ -74,8 +74,6 @@ func runWeb(*cli.Context) {
                middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
        m.Get("/:username/:reponame", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
 
-       //m.Get("/:username/:reponame", repo.Repo)
-
        listenAddr := fmt.Sprintf("%s:%s",
                base.Cfg.MustValue("server", "HTTP_ADDR"),
                base.Cfg.MustValue("server", "HTTP_PORT", "3000"))