diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-15 01:16:25 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-20 16:54:28 +0100 |
| commit | 19eb63741995e3be60781db74edab5d5ae896c6b (patch) | |
| tree | 349c2f0d63b4bf89500de1c8c3ee5887dc981e68 /app/helpers/application_helper.rb | |
| parent | b2e46f44ceee2078b8e1d92ae5ff892c044bc0e7 (diff) | |
| download | gitlab-ce-19eb63741995e3be60781db74edab5d5ae896c6b.tar.gz | |
Update uses of Gitolite.config.foo settings
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 571c0cb71b6..c9e939801c2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,7 @@ module ApplicationHelper if Gitlab.config.disable_gravatar? || user_email.blank? 'no_avatar.png' else - gravatar_url = request.ssl? ? Gitlab.config.gravatar_ssl_url : Gitlab.config.gravatar_url + gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url user_email.strip! sprintf(gravatar_url, {:hash => Digest::MD5.hexdigest(user_email.downcase), :email => URI.escape(user_email), :size => size}) end @@ -48,7 +48,7 @@ module ApplicationHelper end def web_app_url - "#{request_protocol}://#{Gitlab.config.web_host}/" + "#{request_protocol}://#{Gitlab.config.gitlab.host}/" end def last_commit(project) |