diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 16:49:51 +0300 |
| commit | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch) | |
| tree | 6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /config/settings.rb | |
| parent | a7253423e3403b8c08f8a161e5937e1488f5f407 (diff) | |
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'config/settings.rb')
| -rw-r--r-- | config/settings.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/settings.rb b/config/settings.rb index 34acb09b9ed..ae95af802c4 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -11,6 +11,17 @@ class Settings < Settingslogic on_standard_port?(gitlab) end + def build_ci_component_fqdn + custom_port = ":#{gitlab.port}" unless on_standard_port?(gitlab) + + [ + gitlab.host, + custom_port, + gitlab.relative_url_root, + '/' + ].join('') + end + def host_without_www(url) host(url).sub('www.', '') end |