Mirror updates

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 08013d370530704b44f33466ab6960e8768ffaaa..1b71d5313641ab3d381c202e98cbebef93bd259d 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,49 +1,29 @@
 # Contributing to Gogs
 
-Want to hack on Gogs? Awesome! Here are instructions to get you
-started. They are probably not perfect, please let us know if anything
-feels wrong or incomplete.
+> Thanks [drone](https://github.com/drone/drone) because this guidelines sheet is forked from its [CONTRIBUTING.md](https://github.com/drone/drone/blob/master/CONTRIBUTING.md).
+
+Want to hack on Gogs? Awesome! Here are instructions to get you started. They are probably not perfect, please let us know if anything feels wrong or incomplete.
 
 ## Contribution guidelines
 
 ### Pull requests are always welcome
 
-We are always thrilled to receive pull requests, and do our best to
-process them as fast as possible. Not sure if that typo is worth a pull
-request? Do it! We will appreciate it.
+We are always thrilled to receive pull requests, and do our best to process them as fast as possible. Not sure if that typo is worth a pull request? Do it! We will appreciate it.
 
-If your pull request is not accepted on the first try, don't be
-discouraged! If there's a problem with the implementation, hopefully you
-received feedback on what to improve.
+If your pull request is not accepted on the first try, don't be discouraged! If there's a problem with the implementation, hopefully you received feedback on what to improve.
 
-We're trying very hard to keep Gogs lean and focused. We don't want it
-to do everything for everybody. This means that we might decide against
-incorporating a new feature.
+We're trying very hard to keep Gogs lean and focused. We don't want it to do everything for everybody. This means that we might decide against incorporating a new feature.
 
 ### Discuss your design on the mailing list
 
-We recommend discussing your plans [on the mailing
-list](https://groups.google.com/forum/#!forum/gogits)
-before starting to code - especially for more ambitious contributions.
-This gives other contributors a chance to point you in the right
-direction, give feedback on your design, and maybe point out if someone
-else is working on the same thing.
+We recommend discussing your plans [on the mailing list](https://groups.google.com/forum/#!forum/gogits) before starting to code - especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give feedback on your design, and maybe point out if someone else is working on the same thing.
 
-We may close your pull request if not first discussed on the mailing
-list. We aren't doing this to be jerks. We are doing this to prevent
-people from spending large amounts of time on changes that may need
-to be designed or architected in a specific way, or may not align with
-the vision of the project.
+We may close your pull request if not first discussed on the mailing list. We aren't doing this to be jerks. We are doing this to prevent people from spending large amounts of time on changes that may need to be designed or architected in a specific way, or may not align with the vision of the project.
 
 ### Create issues...
 
-Any significant improvement should be documented as [a GitHub
-issue](https://github.com/gogits/gogs/issues) before anybody
-starts working on it.
+Any significant improvement should be documented as [a GitHub issue](https://github.com/gogits/gogs/issues) before anybody starts working on it.
 
 ### ...but check for existing issues first!
 
-Please take a moment to check that an issue doesn't already exist
-documenting your bug report or improvement proposal. If it does, it
-never hurts to add a quick "+1" or "I have this problem too". This will
-help prioritize the most common problems and requests.
\ No newline at end of file
+Please take a moment to check that an issue doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
\ No newline at end of file

diff --git a/models/user.go b/models/user.go
index 88bbabe6d5beba7109531b7d88d8fabd336c8e24..7fd7449ce500784af065d25c7b0b9c1df0068e2d 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -72,7 +72,10 @@ func (user *User) HomeLink() string {
 
 // AvatarLink returns the user gravatar link.
 func (user *User) AvatarLink() string {
-       return "/avatar/" + user.Avatar
+       if base.Service.EnableCacheAvatar {
+               return "/avatar/" + user.Avatar
+       }
+       return "http://1.gravatar.com/avatar/" + user.Avatar
 }
 
 // NewGitSig generates and returns the signature of given user.

diff --git a/modules/log/log.go b/modules/log/log.go
index 29782fb2ba0c7713fa389e9d6dc805bf536656c2..80ade3d5b228fda79dfb2a11a01cc3d75fd45f01 100644 (file)
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -20,6 +20,10 @@ func Trace(format string, v ...interface{}) {
        logger.Trace(format, v...)
 }
 
+func Debug(format string, v ...interface{}) {
+       logger.Debug(format, v...)
+}
+
 func Info(format string, v ...interface{}) {
        logger.Info(format, v...)
 }

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 78fe4b25d02904fce45d53d60c724f602eb7e80b..a9d87993144a23ef967ecbe85f909761e33951e7 100644 (file)
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -31,6 +31,10 @@ func Issues(ctx *middleware.Context, params martini.Params) {
                return
        }
 
+       if len(params["branchname"]) == 0 {
+               params["branchname"] = "master"
+       }
+       ctx.Data["Branchname"] = params["branchname"]
        ctx.HTML(200, "repo/issues")
 }
 

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 82956098b77e0c033c0698534fae4347dfe85c83..b05ce4a717626d624658b4e0c5f2c7e7e9f4dccf 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -69,7 +69,10 @@ func Branches(ctx *middleware.Context, params martini.Params) {
        ctx.Data["Username"] = params["username"]
        ctx.Data["Reponame"] = params["reponame"]
 
-       ctx.Data["Branchname"] = brs[0]
+       if len(params["branchname"]) == 0 {
+               params["branchname"] = "master"
+       }
+       ctx.Data["Branchname"] = params["branchname"]
        ctx.Data["Branches"] = brs
        ctx.Data["IsRepoToolbarBranches"] = true
 
@@ -334,8 +337,13 @@ func Commits(ctx *middleware.Context, params martini.Params) {
        ctx.HTML(200, "repo/commits")
 }
 
-func Pulls(ctx *middleware.Context) {
+func Pulls(ctx *middleware.Context, params martini.Params) {
        ctx.Data["IsRepoToolbarPulls"] = true
+       if len(params["branchname"]) == 0 {
+               params["branchname"] = "master"
+       }
+
+       ctx.Data["Branchname"] = params["branchname"]
        ctx.HTML(200, "repo/pulls")
 }
 

diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index a3358fd890759239e36fac83cca7d4ebac7c4eee..080cb72e574064d47ba9a7eabee6da9693ae00fd 100644 (file)
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -53,9 +53,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="btn-group">
+                <!-- <div class="btn-group">
                     <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Star"><i class="fa fa-star"></i>&nbsp;{{.Repository.NumStars}}</button>
-                </div>
+                </div> -->
                 {{end}}
                 <div class="btn-group">
                     <a type="button" {{if not .IsRepositoryOwner}}href="/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i>&nbsp;{{.Repository.NumForks}}</a>

diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl
index b51768a3c39befe8b227a718465ddbaeec6c212f..415023d17f71cf24a96def350073696a1b0d0875 100644 (file)
--- a/templates/repo/toolbar.tmpl
+++ b/templates/repo/toolbar.tmpl
@@ -6,27 +6,27 @@
                     <li class="{{if .IsRepoToolbarSource}}active{{end}}"><a href="/{{.RepositoryLink}}">Source</a></li>
                     {{if not .IsBareRepo}}
                     <li class="{{if .IsRepoToolbarCommits}}active{{end}}"><a href="/{{.RepositoryLink}}/commits/{{.Branchname}}">Commits</a></li>
-                    <li class="{{if .IsRepoToolbarBranches}}active{{end}}"><a href="/{{.RepositoryLink}}/branches">Branches</a></li>
-                    <li class="{{if .IsRepoToolbarPulls}}active{{end}}"><a href="/{{.RepositoryLink}}/pulls">Pull Requests</a></li>
+                    <!-- <li class="{{if .IsRepoToolbarBranches}}active{{end}}"><a href="/{{.RepositoryLink}}/branches">Branches</a></li> -->
+                    <!-- <li class="{{if .IsRepoToolbarPulls}}active{{end}}"><a href="/{{.RepositoryLink}}/pulls">Pull Requests</a></li> -->
                     <li class="{{if .IsRepoToolbarIssues}}active{{end}}"><a href="/{{.RepositoryLink}}/issues">Issues <!--<span class="badge">42</span>--></a></li>
-                    <li class="dropdown">
+                    <!-- <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
                         <ul class="dropdown-menu">
                             <li><a href="/{{.RepositoryLink}}/release">Release</a></li>
                             <li><a href="//{{.RepositoryLink}}/wiki">Wiki</a></li>
                         </ul>
-                    </li>{{end}}
+                    </li> -->{{end}}
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
                     {{if not .IsBareRepo}}
-                    <li class="dropdown">
+                    <!-- <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistic <b class="caret"></b></a>
                         <ul class="dropdown-menu">
                             <li><a href="#">Graphic</a></li>
                             <li><a href="#">Pulse</a></li>
                             <li><a href="#">Network</a></li>
                         </ul>
-                    </li>{{end}}{{if .IsRepositoryOwner}}
+                    </li> -->{{end}}{{if .IsRepositoryOwner}}
                     <li class="{{if .IsRepoToolbarSetting}}active{{end}}"><a href="/{{.RepositoryLink}}/settings">Settings</a>
                     </li>{{end}}
                 </ul>

diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index 72c31d3d8fb70561d37b04a3beca9d4bec999b83..6594e54591efb79733b7e737f265691e183dec53 100644 (file)
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -5,8 +5,8 @@
         <ul class="nav nav-pills pull-right">
             <li class="active"><a href="/">Feed</a></li>
             <li><a href="/issues">Issues</a></li>
-            <li><a href="/pulls">Pull Requests</a></li>
-            <li><a href="/stars">Stars</a></li>
+            <!-- <li><a href="/pulls">Pull Requests</a></li>
+            <li><a href="/stars">Stars</a></li> -->
         </ul>
         <h3>News Feed</h3>
     </div>

diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl
index 94f6689456d9e4e8679375d6c4185da7c76800fd..e28af5bec6d8f05d8305c3e842c367c23c3b7d4b 100644 (file)
--- a/templates/user/issues.tmpl
+++ b/templates/user/issues.tmpl
@@ -5,8 +5,8 @@
         <ul class="nav nav-pills pull-right">
             <li><a href="/">Feed</a></li>
             <li class="active"><a href="/issues">Issues</a></li>
-            <li><a href="/pulls">Pull Requests</a></li>
-            <li><a href="/stars">Stars</a></li>
+            <!-- <li><a href="/pulls">Pull Requests</a></li>
+            <li><a href="/stars">Stars</a></li> -->
         </ul>
         <h3>Issues</h3>
     </div>

diff --git a/templates/user/setting_nav.tmpl b/templates/user/setting_nav.tmpl
index 3a500fdafee93d6dbd5a4e6ad9f71cb4ad46f00b..2905f2825c7eb3e01e8e666353fc5a9be4db81c2 100644 (file)
--- a/templates/user/setting_nav.tmpl
+++ b/templates/user/setting_nav.tmpl
@@ -3,9 +3,9 @@
     <ul class="list-group">
         <li class="list-group-item{{if .IsUserPageSetting}} list-group-item-success{{end}}"><a href="/user/setting">Account Profile</a></li>
         <li class="list-group-item{{if .IsUserPageSettingPasswd}} list-group-item-success{{end}}"><a href="/user/setting/password">Password</a></li>
-        <li class="list-group-item{{if .IsUserPageSettingNotify}} list-group-item-success{{end}}"><a href="/user/setting/notification">Notifications</a></li>
+        <!-- <li class="list-group-item{{if .IsUserPageSettingNotify}} list-group-item-success{{end}}"><a href="/user/setting/notification">Notifications</a></li> -->
         <li class="list-group-item{{if .IsUserPageSettingSSH}} list-group-item-success{{end}}"><a href="/user/setting/ssh/">SSH Keys</a></li>
-        <li class="list-group-item{{if .IsUserPageSettingSecurity}} list-group-item-success{{end}}"><a href="/user/setting/security">Security</a></li>
+        <!-- <li class="list-group-item{{if .IsUserPageSettingSecurity}} list-group-item-success{{end}}"><a href="/user/setting/security">Security</a></li> -->
         <li class="list-group-item{{if .IsUserPageSettingDelete}} list-group-item-success{{end}}"><a href="/user/delete">Delete Account</a></li>
     </ul>
 </div>
\ No newline at end of file