summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-08-19 14:02:22 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-08-19 14:02:22 +0000
commit3eb4904087f12dcbd69b82f61a69d75788b28e57 (patch)
treec0827eba65874c7ea546911d8a6e7a65c3ee5542 /app/views/projects
parent39c44977f66db456600af10be478e07197bdf082 (diff)
parent3861a8c5fca96bf374e1f210a4e2082be01485f7 (diff)
downloadgitlab-ce-3eb4904087f12dcbd69b82f61a69d75788b28e57.tar.gz
Merge branch 'fix-button-missing-type' into 'master'
Fix button missing type ## What does this MR do? Adds the `type` attribute to `<button>` ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? So that bootlint would stop giving warnings on the issue thread page and the merge request thread page ## What are the relevant issue numbers? #20715 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5718
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/issues/show.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_title.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 9f1a046ea74..3fb4191c60e 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -22,7 +22,7 @@
- if can?(current_user, :create_issue, @project) || can?(current_user, :update_issue, @issue)
.issuable-actions
.clearfix.issue-btn-group.dropdown
- %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ data: { toggle: "dropdown" } }
+ %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
%span.caret
Options
.dropdown-menu.dropdown-menu-align-right.hidden-lg
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index b24bdf22ceb..098ce19da21 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -14,7 +14,7 @@
- if can?(current_user, :update_merge_request, @merge_request)
.issuable-actions
.clearfix.issue-btn-group.dropdown
- %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ data: { toggle: "dropdown" } }
+ %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
%span.caret
Options
.dropdown-menu.dropdown-menu-align-right.hidden-lg