Commit 166e9f8f authored by Grzegorz Bizon's avatar Grzegorz Bizon 🔴

Merge branch '28260-fix-pages-custom-domain-url' into 'master'

Resolve "Fix wrong output protocol pattern when adding custom domain to Pages"

Closes #28260

See merge request gitlab-org/gitlab-ce!16279
parents af3a8f96 75e718f2
Pipeline #15912601 passed with stages
in 67 minutes and 19 seconds
......@@ -27,7 +27,7 @@ class PagesDomain < ActiveRecord::Base
def url
return unless domain
if certificate
if certificate.present?
"https://#{domain}"
else
"http://#{domain}"
......
---
title: Generate HTTP URLs for custom Pages domains when appropriate
merge_request: 16279
author:
type: fixed
......@@ -68,7 +68,7 @@ describe PagesDomain do
subject { domain.url }
context 'without the certificate' do
let(:domain) { build(:pages_domain) }
let(:domain) { build(:pages_domain, certificate: '') }
it { is_expected.to eq('http://my.domain.com') }
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