From a1908447b77a6d005a77f1be2f717cd35274c82d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 26 Oct 2020 15:08:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/page_layout_helper.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/helpers/page_layout_helper.rb') 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 -- cgit v1.2.3