diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-08 21:03:14 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-08 21:03:14 +0300 |
| commit | aee110e20dd81861a62ea458b5629619c32a2d0a (patch) | |
| tree | f1185b516463a9baf0a2cca023a4d7396d29bdbf /app/helpers/application_helper.rb | |
| parent | 5bd5d09b83c21bca1d6cd534622f410f9b0da4de (diff) | |
| download | gitlab-ce-aee110e20dd81861a62ea458b5629619c32a2d0a.tar.gz | |
Add extra config for some advanced customization
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 703c88975a3..ef90a8877ee 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,7 @@ module ApplicationHelper if !Gitlab.config.gravatar.enabled || user_email.blank? 'no_avatar.png' else - gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url + gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url user_email.strip! sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size end @@ -196,4 +196,14 @@ module ApplicationHelper [namespace, controller.controller_name, controller.action_name].compact.join(":") end + + # shortcut for gitlab config + def gitlab_config + Gitlab.config.gitlab + end + + # shortcut for gitlab extra config + def extra_config + Gitlab.config.extra + end end |
