diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-08 15:54:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-08 15:54:59 +0000 |
| commit | 166e9f8fbabfec2b1c27c1adf2d1721b399a30ee (patch) | |
| tree | 9cd9df5c006f755ff9246eb4573e4dcc70a2b0c9 /app/models | |
| parent | af3a8f96f8175353ef5860f4255d63be72a4c5bc (diff) | |
| parent | 75e718f207083615252b9ef047c4c466d9fcb5a0 (diff) | |
| download | gitlab-ce-166e9f8fbabfec2b1c27c1adf2d1721b399a30ee.tar.gz | |
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
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/pages_domain.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 8de42ff9d2e..d8bf54e0c40 100644 --- 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}" |