diff options
| author | Unknwon <u@gogs.io> | 2016-08-07 11:01:47 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-08-07 11:01:47 -0700 |
| commit | 99385db0c418fb49838eb1a23f391cf826d99202 (patch) | |
| tree | 9c8fe94489becb5a1909d07156cbb8ed81f69d2f /conf | |
| parent | 90dd0657b564210746c9c494c8c5b07dd8eee91f (diff) | |
| download | gitea-99385db0c418fb49838eb1a23f391cf826d99202.tar.gz gitea-99385db0c418fb49838eb1a23f391cf826d99202.zip | |
#3320 code cleanup
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 2 | ||||
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/conf/app.ini b/conf/app.ini index e46436e65d..ba7c22ec17 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -229,9 +229,11 @@ AVATAR_UPLOAD_PATH = data/avatars ; Chinese users can choose "duoshuo" ; or a custom avatar source, like: http://cn.gravatar.com/avatar/ GRAVATAR_SOURCE = gravatar +; This value will be forced to be true in offline mode. DISABLE_GRAVATAR = false ; Federated avatar lookup uses DNS to discover avatar associated ; with emails, see http://www.libravatar.org +; This value will be forced to be false in offline mode or Gravatar is disbaled. ENABLE_FEDERATED_AVATAR = false [attachment] diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 99b5d17363..31d75549a5 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -97,6 +97,7 @@ offline_mode_popup = Disable CDN even in production mode, all resource files wil disable_gravatar = Disable Gravatar Service disable_gravatar_popup = Disable Gravatar and custom sources, all avatars are uploaded by users or default. federated_avatar_lookup = Enable Federated Avatars Lookup +federated_avatar_lookup_popup = Enable federated avatars lookup to use federated open source service based on libravatar. disable_registration = Disable Self-registration disable_registration_popup = Disable user self-registration, only admin can create accounts. enable_captcha = Enable Captcha |