From ba47306a6987cf5357a08d55e5cab75a87d2b025 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Tue, 28 Jul 2015 18:01:27 +0800
Subject: [PATCH] fix #1305
---
cmd/web.go | 2 +-
templates/org/settings/options.tmpl | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmd/web.go b/cmd/web.go
index b6d41c1aaf..90e8a7de91 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -85,7 +85,7 @@ func checkVersion() {
{"github.com/macaron-contrib/csrf", csrf.Version, "0.0.3"},
{"github.com/macaron-contrib/i18n", i18n.Version, "0.0.7"},
{"github.com/macaron-contrib/session", session.Version, "0.1.6"},
- {"gopkg.in/ini.v1", ini.Version, "1.2.0"},
+ {"gopkg.in/ini.v1", ini.Version, "1.3.4"},
}
for _, c := range checkers {
ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 86e52fcd82..6544fb4cea 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -46,12 +46,10 @@
<label for="location">{{.i18n.Tr "org.settings.location"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" />
</div>
- {{if not DisableGravatar}}
- <div class="field">
+ <div class="field {{if DisableGravatar}}hide{{end}}">
<label for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.Org.AvatarEmail}}" />
</div>
- {{end}}
<div class="field">
<span class="form-label"></span>
<button class="btn btn-green btn-large btn-radius" id="change-orgname-btn" href="#change-orgname-modal">{{.i18n.Tr "org.settings.update_settings"}}</button>