Verified Commit 75e718f2 authored by Nick Thomas's avatar Nick Thomas 🔴

Generate HTTP URLs for custom Pages domains when appropriate

parent 2c66b942
...@@ -27,7 +27,7 @@ class PagesDomain < ActiveRecord::Base ...@@ -27,7 +27,7 @@ class PagesDomain < ActiveRecord::Base
def url def url
return unless domain return unless domain
if certificate if certificate.present?
"https://#{domain}" "https://#{domain}"
else else
"http://#{domain}" "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 ...@@ -68,7 +68,7 @@ describe PagesDomain do
subject { domain.url } subject { domain.url }
context 'without the certificate' do 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') } it { is_expected.to eq('http://my.domain.com') }
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