diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-01-04 01:02:30 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-04 16:48:10 +0000 |
| commit | d92d93087070d1dc80efb284abcb2688b918626d (patch) | |
| tree | 4c7b7fbf1ecb8e09ffec80957d8f7acb168a952c /app/helpers | |
| parent | 4d0c547e7d365377948c7404b7fcef38fb7987bf (diff) | |
| download | gitlab-ce-d92d93087070d1dc80efb284abcb2688b918626d.tar.gz | |
Merge branch 'sh-fix-clone-url-for-https' into 'master'11-6-stable-patch-3
Fix clone URL not showing if protocol is HTTPS
Closes #55896
See merge request gitlab-org/gitlab-ce!24131
(cherry picked from commit 64c582d1841a35193c684a707b9688feb2d21772)
913084e6 Fix clone URL not showing if protocol is HTTPS
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index a95fb92a15b..b4c6d4c6cfe 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -20,7 +20,7 @@ module ApplicationSettingsHelper def enabled_protocol case Gitlab::CurrentSettings.enabled_git_access_protocol when 'http' - gitlab_config.protocol + Gitlab.config.gitlab.protocol when 'ssh' 'ssh' end @@ -35,7 +35,7 @@ module ApplicationSettingsHelper end def http_enabled? - all_protocols_enabled? || enabled_protocol == 'http' + all_protocols_enabled? || Gitlab::CurrentSettings.enabled_git_access_protocol == 'http' end def enabled_project_button(project, protocol) |