Merge branch 'master' of https://github.com/gogits/gogs

README.md

@@ -40,7 +40,7 @@ There are two ways to install Gogs:
 ## Acknowledgments
 
 - Mail service is based on [WeTalk](https://github.com/beego/wetalk).
-- Logo inspired by [martini](https://github.com/martini-contrib).
+- Logo is inspired by [martini](https://github.com/martini-contrib).
 
 ## Contributors
 

models/repo.go

@@ -34,6 +34,7 @@ type Repository struct {
 	LowerName   string `xorm:"unique(s) index not null"`
 	Name        string `xorm:"index not null"`
 	Description string
+	Website     string
 	Private     bool
 	NumWatchs   int
 	NumStars    int

templates/repo/nav.tmpl

@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-md-6">
                 <h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3>
-                <p class="desc">a sentence to describe the repository.<a href="#">official-site</a></p>
+                <p class="desc">{{.Repository.Description}}{{if .Repository.Website}}<a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p>
             </div>
             {{if not .IsBareRepo}}
             <div class="col-md-6 actions text-right">