diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-26 18:08:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-26 18:08:40 +0300 |
| commit | a1908447b77a6d005a77f1be2f717cd35274c82d (patch) | |
| tree | 8348f9346b1631d78b0ae5e5493ebdef5273d5cb /app/helpers/page_layout_helper.rb | |
| parent | 6e320396b26439a0c3fa1df1ce9f4c2395518227 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 6808ffc3e27..10eb3d71dad 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -57,7 +57,10 @@ module PageLayoutHelper subject = @project || @user || @group - image = subject.avatar_url if subject.present? + args = {} + args[:only_path] = false if Feature.enabled?(:avatar_with_host) + + image = subject.avatar_url(args) if subject.present? image || default end |