Commit 2856d5f9 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Merge pull request #9241 from Soullivaneuh/button-type

Fix missing button types
parents b4150137 5bc5188a
......@@ -32,7 +32,7 @@
.issuable-context-title
%label
Subscription:
%button.btn.btn-block.subscribe-button
%button.btn.btn-block.subscribe-button{:type => 'button'}
%i.fa.fa-eye
%span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
- subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
......
......@@ -34,7 +34,7 @@
.issuable-context-title
%label
Subscription:
%button.btn.btn-block.subscribe-button
%button.btn.btn-block.subscribe-button{:type => 'button'}
%i.fa.fa-eye
%span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
- subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
......
......@@ -53,7 +53,7 @@
command line
%p
%button.btn.disabled
%button.btn.disabled{:type => 'button'}
%i.fa.fa-warning
Accept Merge Request
 
......@@ -64,7 +64,7 @@
This request can't be merged because it is marked a <strong>Work In Progress</strong>.
%p
%button.btn.disabled
%button.btn.disabled{:type => 'button'}
%i.fa.fa-warning
Accept Merge Request
&nbsp;
......
......@@ -2,6 +2,7 @@
.git-clone-holder.input-group
.input-group-btn
%button{ |
:type => 'button', |
class: "btn #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", |
:"data-clone" => project.ssh_url_to_repo, |
:"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH",
......@@ -9,6 +10,7 @@
:"data-container" => "body"}
SSH
%button{ |
:type => 'button', |
class: "btn #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", |
:"data-clone" => project.http_url_to_repo, |
:"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment