Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-05 22:50:52 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-01-05 22:50:52 +0300
commita298f694327b1241fc0d06618228e3750c20c5a1 (patch)
treed327b258ecffa12dc7da908cf6966a527f859121 /app/helpers/page_layout_helper.rb
parent7a3b76297873782e2a56e77bcf55bbe950e57453 (diff)
Use `User#avatar_url` instead of `avatar_icon` helper
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r--app/helpers/page_layout_helper.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index b84644d6996..f2a4afebbd1 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -49,12 +49,10 @@ module PageLayoutHelper
def page_image
default = image_url('gitlab_logo.png')
- if @project
- @project.avatar_url || default
- elsif @user
- avatar_icon(@user)
- elsif @group
- @group.avatar_url || default
+ subject = @project || @user || @group
+
+ if subject.present?
+ subject.avatar_url || default
else
default
end