kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Generate HTTP URLs for custom Pages domains when appropriate

Browse source
This commit is contained in:
Nick Thomas 2018-01-08 01:27:19 +00:00
parent 2c66b942bd
commit 75e718f207
No known key found for this signature in database
GPG key ID: 2A313A47AFADACE9
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/pages_domain.rb
View file

@ -27,7 +27,7 @@ class PagesDomain < ActiveRecord::Base
def url
return unless domain
if certificate
if certificate.present?
"https://#{domain}"
else
"http://#{domain}"

5
changelogs/unreleased/28260-fix-pages-custom-domain-url.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Generate HTTP URLs for custom Pages domains when appropriate
merge_request: 16279
author:
type: fixed

2
spec/models/pages_domain_spec.rb
View file

@ -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