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

Merge branch '28260-fix-pages-custom-domain-url' into 'master'
166e9f8f · Grzegorz Bizon · af3a8f96 · 75e718f2 · 166e9f8f · 166e9f8f
Commit 166e9f8f authored Jan 08, 2018 by Grzegorz Bizon
Showing with 7 additions and 2 deletions

pages_domain.rb app/models/pages_domain.rb +1 -1

28260-fix-pages-custom-domain-url.yml changelogs/unreleased/28260-fix-pages-custom-domain-url.yml +5 -0

pages_domain_spec.rb spec/models/pages_domain_spec.rb +1 -1

No files found.
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -27,7 +27,7 @@ class PagesDomain < ActiveRecord::Base
  def url
    return unless domain

-    if certificate
+    if certificate.present?
      "https://#{domain}"
    else
      "http://#{domain}"

--- a/changelogs/unreleased/28260-fix-pages-custom-domain-url.yml
+++ b/changelogs/unreleased/28260-fix-pages-custom-domain-url.yml
+---
+title: Generate HTTP URLs for custom Pages domains when appropriate
+merge_request: 16279
+author:
+type: fixed
--- a/spec/models/pages_domain_spec.rb
+++ b/spec/models/pages_domain_spec.rb
@@ -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