diff options
| author | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
| commit | 887bc1b594ef5c279c28c90009e67b068978482f (patch) | |
| tree | d4390bf5b8a6b4f581fc322a3290e69315060b78 /modules/setting/setting.go | |
| parent | 884bc4ffd81f5b952df172d43ba7b16e1844ff19 (diff) | |
| parent | 2aea247208d4429d111fb9725c16a8e9ea24860f (diff) | |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# modules/bindata/bindata.go
# public/css/gogs.min.css
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7f9d9908..d32df473 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -15,10 +15,11 @@ import ( "strings" "time" + "gopkg.in/ini.v1" + "github.com/Unknwon/com" "github.com/macaron-contrib/oauth2" "github.com/macaron-contrib/session" - "gopkg.in/ini.v1" "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" @@ -345,11 +346,13 @@ func NewConfigContext() { if !filepath.IsAbs(AvatarUploadPath) { AvatarUploadPath = path.Join(workDir, AvatarUploadPath) } - switch sec.Key("GRAVATAR_SOURCE").MustString("gravatar") { + switch source := sec.Key("GRAVATAR_SOURCE").MustString("gravatar"); source { case "duoshuo": GravatarSource = "http://gravatar.duoshuo.com/avatar/" - default: + case "gravatar": GravatarSource = "//1.gravatar.com/avatar/" + default: + GravatarSource = source } DisableGravatar = sec.Key("DISABLE_GRAVATAR").MustBool() if OfflineMode { |