diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml index 9228074d833a293b9fbc63df4e4f209be8c2c343..7cadb9983fa8f44b0e82e2d0248d91d59e273074 100644 --- a/app/views/projects/issues/_issue_context.html.haml +++ b/app/views/projects/issues/_issue_context.html.haml @@ -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" diff --git a/app/views/projects/merge_requests/show/_context.html.haml b/app/views/projects/merge_requests/show/_context.html.haml index 105562fb05e31bfa02caae672989f52a1533ac7b..eb80391ebcd48c4450157c947b78236b92766fda 100644 --- a/app/views/projects/merge_requests/show/_context.html.haml +++ b/app/views/projects/merge_requests/show/_context.html.haml @@ -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" diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 41f739a45b8bb5a69f6c8643811d3bd01bafea33..cb536214c69f0d27a7f11099034a09e1cffe42d9 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -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 diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index 8b1e3a6dd5e229f8992984a7f2fa60a2ea4ca085..96357cac5923d506241d1b5d8eadca50b692be19 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -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}",