From d92d93087070d1dc80efb284abcb2688b918626d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 4 Jan 2019 01:02:30 +0000
Subject: 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

(cherry picked from commit 64c582d1841a35193c684a707b9688feb2d21772)

913084e6 Fix clone URL not showing if protocol is HTTPS
---
 app/helpers/application_settings_helper.rb         |  4 +--
 .../unreleased/sh-fix-clone-url-for-https.yml      |  5 +++
 spec/helpers/application_settings_helper_spec.rb   | 39 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/sh-fix-clone-url-for-https.yml
 create mode 100644 spec/helpers/application_settings_helper_spec.rb

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)
diff --git a/changelogs/unreleased/sh-fix-clone-url-for-https.yml b/changelogs/unreleased/sh-fix-clone-url-for-https.yml
new file mode 100644
index 00000000000..6a17d566685
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-clone-url-for-https.yml
@@ -0,0 +1,5 @@
+---
+title: Fix clone URL not showing if protocol is HTTPS
+merge_request: 24131
+author:
+type: fixed
diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
new file mode 100644
index 00000000000..705523f1110
--- /dev/null
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ApplicationSettingsHelper do
+  context 'when all protocols in use' do
+    before do
+      stub_application_setting(enabled_git_access_protocol: '')
+    end
+
+    it { expect(all_protocols_enabled?).to be_truthy }
+    it { expect(http_enabled?).to be_truthy }
+    it { expect(ssh_enabled?).to be_truthy }
+  end
+
+  context 'when SSH is only in use' do
+    before do
+      stub_application_setting(enabled_git_access_protocol: 'ssh')
+    end
+
+    it { expect(all_protocols_enabled?).to be_falsey }
+    it { expect(http_enabled?).to be_falsey }
+    it { expect(ssh_enabled?).to be_truthy }
+  end
+
+  shared_examples 'when HTTP protocol is in use' do |protocol|
+    before do
+      allow(Gitlab.config.gitlab).to receive(:protocol).and_return(protocol)
+      stub_application_setting(enabled_git_access_protocol: 'http')
+    end
+
+    it { expect(all_protocols_enabled?).to be_falsey }
+    it { expect(http_enabled?).to be_truthy }
+    it { expect(ssh_enabled?).to be_falsey }
+  end
+
+  it_behaves_like 'when HTTP protocol is in use', 'https'
+  it_behaves_like 'when HTTP protocol is in use', 'http'
+end
-- 
cgit v1.2.1