diff options
| author | Thibault Meyer <meyer.thibault@gmail.com> | 2016-10-04 18:58:14 +0200 |
|---|---|---|
| committer | Thibault Meyer <meyer.thibault@gmail.com> | 2016-10-04 18:58:14 +0200 |
| commit | 93f1eabe3087ac723f8f404def8dba40359f0d64 (patch) | |
| tree | e3548dc23d09ddd9cfb93393b5ca1961e32cc2b6 | |
| parent | 9d66497abca96905fbeba53bf8983301710d6064 (diff) | |
| download | gitea-93f1eabe3087ac723f8f404def8dba40359f0d64.tar.gz gitea-93f1eabe3087ac723f8f404def8dba40359f0d64.zip | |
rename variable + fix wiki link
| -rw-r--r-- | modules/context/repo.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 3 | ||||
| -rw-r--r-- | routers/repo/http.go | 2 | ||||
| -rw-r--r-- | templates/repo/wiki/view.tmpl | 8 |
4 files changed, 8 insertions, 7 deletions
diff --git a/modules/context/repo.go b/modules/context/repo.go index 8b52a20a4a..b3d483df3f 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -256,7 +256,7 @@ func RepoAssignment(args ...bool) macaron.Handler { ctx.Data["IsRepositoryWriter"] = ctx.Repo.IsWriter() ctx.Data["DisableSSH"] = setting.SSH.Disabled - ctx.Data["DisableHTTP"] = setting.Repository.DisableHttpGit + ctx.Data["DisableHTTP"] = setting.Repository.DisableHTTPGit ctx.Data["CloneLink"] = repo.CloneLink() ctx.Data["WikiCloneLink"] = repo.WikiCloneLink() diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 0e0d8f9d3a..6470031071 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -116,7 +116,7 @@ var ( MirrorQueueLength int PullRequestQueueLength int PreferredLicenses []string - DisableHttpGit bool + DisableHTTPGit bool // Repository editor settings Editor struct { @@ -491,6 +491,7 @@ func NewContext() { // Determine and create root git repository path. sec = Cfg.Section("repository") + Repository.DisableHTTPGit = sec.Key("DISABLE_HTTP_GIT").MustBool() RepoRootPath = sec.Key("ROOT").MustString(path.Join(homeDir, "gogs-repositories")) forcePathSeparator(RepoRootPath) if !filepath.IsAbs(RepoRootPath) { diff --git a/routers/repo/http.go b/routers/repo/http.go index 47cc199457..65a5d5facf 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -479,7 +479,7 @@ func HTTPBackend(ctx *context.Context, cfg *serviceConfig) http.HandlerFunc { for _, route := range routes { r.URL.Path = strings.ToLower(r.URL.Path) // blue: In case some repo name has upper case name if m := route.reg.FindStringSubmatch(r.URL.Path); m != nil { - if setting.Repository.DisableHttpGit { + if setting.Repository.DisableHTTPGit { w.WriteHeader(http.StatusForbidden) w.Write([]byte("Interacting with repositories by HTTP protocol is not allowed")) return diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 7c4f34fb13..dc4938ab0c 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -30,19 +30,19 @@ <div class="ui six wide column"> <div class="ui action small input" id="clone-panel"> {{if not $.DisableHTTP}} - <button class="ui basic clone button" id="repo-clone-https" data-link="{{.CloneLink.HTTPS}}"> + <button class="ui basic clone button" id="repo-clone-https" data-link="{{.WikiCloneLink.HTTPS}}"> {{if UseHTTPS}}HTTPS{{else}}HTTP{{end}} </button> {{end}} {{if not $.DisableSSH}} - <button class="ui basic clone button" id="repo-clone-ssh" data-link="{{.CloneLink.SSH}}"> + <button class="ui basic clone button" id="repo-clone-ssh" data-link="{{.WikiCloneLink.SSH}}"> SSH </button> {{end}} {{if not $.DisableHTTP}} - <input id="repo-clone-url" value="{{$.CloneLink.HTTPS}}" readonly> + <input id="repo-clone-url" value="{{$.WikiCloneLink.HTTPS}}" readonly> {{else}} - <input id="repo-clone-url" value="{{$.CloneLink.SSH}}" readonly> + <input id="repo-clone-url" value="{{$.WikiCloneLink.SSH}}" readonly> {{end}} <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"> <i class="octicon octicon-clippy"></i> |