Allow disabling Gravatars in gitlab.yml settings

Closes #1237
This commit is contained in:
Robert Speicher 2012-08-15 21:06:08 -04:00
parent 0456dd72e2
commit 65bcc41f3e
4 changed files with 43 additions and 11 deletions

View file

@ -1,4 +1,4 @@
# # # # # # # # # # # # # # # # # #
# # # # # # # # # # # # # # # # # #
# Gitlab application config file #
# # # # # # # # # # # # # # # # # #
@ -19,14 +19,14 @@ email:
# Application specific settings
# Like default project limit for user etc
app:
default_projects_limit: 10
app:
default_projects_limit: 10
# backup_path: "/vol/backups" # default: Rails.root + backups/
# backup_keep_time: 604800 # default: 0 (forever) (in seconds)
# disable_gravatar: true # default: false - Disable user avatars from Gravatar.com
#
# 2. Advanced settings:
#
# 2. Advanced settings:
# ==========================
# Git Hosting configuration
@ -39,7 +39,6 @@ git_host:
receive_pack: true
# port: 22
# Git settings
# Use default values unless you understand it
git:

View file

@ -111,5 +111,9 @@ class Settings < Settingslogic
def backup_keep_time
app['backup_keep_time'] || 0
end
def disable_gravatar?
app['disable_gravatar'] || false
end
end
end