more HTTP clone word fix

modules/template/template.go

@@ -25,8 +25,8 @@ var Funcs template.FuncMap = map[string]interface{}{
 	"GoVer": func() string {
 		return strings.Title(runtime.Version())
 	},
-	"Protocol": func() string {
+	"UseHTTPS": func() bool {
-		return string(setting.Protocol)
+		return strings.HasPrefix(setting.AppUrl, "https")
 	},
 	"AppName": func() string {
 		return setting.AppName

routers/repo/pull.go

@@ -448,7 +448,7 @@ func ParseCompareInfo(ctx *middleware.Context) (*models.User, *models.Repository
 
 	// Check if current user has fork of repository.
 	headRepo, has := models.HasForkedRepo(headUser.Id, repo.ID)
-	if !has || !ctx.User.IsAdminOfRepo(headRepo) {
+	if !has || (!ctx.User.IsAdminOfRepo(headRepo) && !ctx.User.IsAdmin) {
 		ctx.Handle(404, "HasForkedRepo", nil)
 		return nil, nil, nil, nil, "", ""
 	}

templates/repo/bare.tmpl

@@ -22,7 +22,7 @@
               </button>
               {{end}}
               <button class="ui {{if $.DisableSSH}}blue{{end}} basic clone button" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}">
-                HTTPS
+                {{if UseHTTPS}}HTTPS{{else}}HTTP{{end}}
               </button>
               <input id="repo-clone-url" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" readonly>
               <button class="ui basic button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url">

templates/repo/home.tmpl

@@ -18,7 +18,7 @@
           </button>
           {{end}}
           <button class="ui {{if $.DisableSSH}}blue{{end}} basic clone button" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}">
-            {{if eq Protocol "http"}}HTTP{{else}}HTTPS{{end}}
+            {{if UseHTTPS}}HTTPS{{else}}HTTP{{end}}
           </button>
           <input id="repo-clone-url" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" readonly>
           <button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url">