Merge branch '40850-ssh-warning-message-appears-in-clone-box' into 'master'

app/helpers/button_helper.rb

@@ -84,7 +84,7 @@ module ButtonHelper
     button_content << content_tag(:span, description, class: 'dropdown-menu-inner-content') if description
 
     content_tag (href ? :a : :span),
-      button_content,
+      (href ? button_content : title),
       class: "#{title.downcase}-selector",
       href: (href if href)
   end

app/views/shared/_clone_panel.html.haml

@@ -3,7 +3,7 @@
 .git-clone-holder.input-group
   .input-group-btn
     - if allowed_protocols_present?
-      .clone-dropdown-btn.btn.btn-static
+      .clone-dropdown-btn.btn
         %span
           = enabled_project_button(project, enabled_protocol)
     - else

spec/helpers/button_helper_spec.rb

@@ -92,6 +92,34 @@ describe ButtonHelper do
     end
   end
 
+  describe 'ssh and http clone buttons' do
+    let(:user) { create(:user) }
+    let(:project) { build_stubbed(:project) }
+
+    def http_button_element
+      element = helper.http_clone_button(project, append_link: false)
+
+      Nokogiri::HTML::DocumentFragment.parse(element).first_element_child
+    end
+
+    def ssh_button_element
+      element = helper.ssh_clone_button(project, append_link: false)
+
+      Nokogiri::HTML::DocumentFragment.parse(element).first_element_child
+    end
+
+    before do
+      allow(helper).to receive(:current_user).and_return(user)
+    end
+
+    it 'only shows the title of any of the clone buttons when append_link is false' do
+      expect(http_button_element.text).to eq('HTTP')
+      expect(http_button_element.search('.dropdown-menu-inner-content').first).to eq(nil)
+      expect(ssh_button_element.text).to eq('SSH')
+      expect(ssh_button_element.search('.dropdown-menu-inner-content').first).to eq(nil)
+    end
+  end
+
   describe 'clipboard_button' do
     let(:user) { create(:user) }
     let(:project) { build_stubbed(:project) }