diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-06 10:19:17 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-06 10:19:17 +0200 |
| commit | 2856d5f9fcc0c3e7e8f9b22e722e50e88a04daee (patch) | |
| tree | 9135ff8ac808c7d88af0fa266a3c326e041950ea | |
| parent | b4150137e95a99ee56c044ba8bbbd97ffad843c5 (diff) | |
| parent | 5bc5188a06eb73559a8128eba9cb3bcfa045f829 (diff) | |
| download | gitlab-ce-2856d5f9fcc0c3e7e8f9b22e722e50e88a04daee.tar.gz | |
Merge pull request #9241 from Soullivaneuh/button-type
Fix missing button types
4 files changed, 6 insertions, 4 deletions
diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml index 9228074d833..7cadb9983fa 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 105562fb05e..eb80391ebcd 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 41f739a45b8..cb536214c69 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 8b1e3a6dd5e..96357cac592 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}", |