diff options
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/button_helper.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 92166461462..78c0b79d2bd 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -47,9 +47,9 @@ module ApplicationSettingsHelper def enabled_project_button(project, protocol) case protocol when 'ssh' - ssh_clone_button(project, 'bottom', false) + ssh_clone_button(project, 'bottom', append_link: false) else - http_clone_button(project, 'bottom', false) + http_clone_button(project, 'bottom', append_link: false) end end diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb index 7fd20d13010..0f097f86816 100644 --- a/app/helpers/button_helper.rb +++ b/app/helpers/button_helper.rb @@ -40,13 +40,13 @@ module ButtonHelper type: :button end - def http_clone_button(project, placement = 'right', append_link = true) + def http_clone_button(project, placement = 'right', append_link: true) klass = 'http-selector' klass << ' has-tooltip' if current_user.try(:require_password?) protocol = gitlab_config.protocol.upcase - content_tag :a, protocol, + content_tag (append_link ? :a : :span), protocol, class: klass, href: (project.http_url_to_repo if append_link), data: { @@ -57,11 +57,11 @@ module ButtonHelper } end - def ssh_clone_button(project, placement = 'right', append_link = true) + def ssh_clone_button(project, placement = 'right', append_link: true) klass = 'ssh-selector' klass << ' has-tooltip' if current_user.try(:require_ssh_key?) - content_tag :a, 'SSH', + content_tag (append_link ? :a : :span), 'SSH', class: klass, href: (project.ssh_url_to_repo if append_link), data: { |