diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-01-04 04:02:30 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-01-04 04:02:30 +0300 |
| commit | 64c582d1841a35193c684a707b9688feb2d21772 (patch) | |
| tree | 1596324284e6f3a76e6384ee59d09b03596d2dd9 /app | |
| parent | fb4b0e6ca160ebc866deb95ae9e830993578ebe1 (diff) | |
| parent | 913084e6a3147fb55e66fc38b230f1166b7e9f8b (diff) | |
Merge branch 'sh-fix-clone-url-for-https' into 'master'
Fix clone URL not showing if protocol is HTTPS
Closes #55896
See merge request gitlab-org/gitlab-ce!24131
Diffstat (limited to 'app')
| -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 5a7c005fd06..c8e4e2e3df9 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) |