Commit 6cac0486 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '273142-fj-enable-avatar-with-full-url' into 'master'

Enable avatar with full url

See merge request gitlab-org/gitlab!46206
parents 2e006642 1d062b4b
......@@ -57,10 +57,7 @@ module PageLayoutHelper
subject = @project || @user || @group
args = {}
args[:only_path] = false if Feature.enabled?(:avatar_with_host)
image = subject.avatar_url(args) if subject.present?
image = subject.avatar_url(only_path: false) if subject.present?
image || default
end
......
---
title: Enable rendering avatars with full url
merge_request: 46206
author:
type: fixed
---
name: avatar_with_host
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45776
rollout_issue_url:
type: development
group: group::editor
default_enabled: false
......@@ -82,16 +82,6 @@ RSpec.describe PageLayoutHelper do
expect(helper.page_image).to match_asset_path 'assets/gitlab_logo.png'
end
end
context 'if avatar_with_host is disabled' do
it "#{type.titlecase} does not generate avatar full url" do
stub_feature_flags(avatar_with_host: false)
assign(type, object)
expect(helper.page_image).to eq object.avatar_url(only_path: true)
end
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment