summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-09-28 00:54:47 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-09-28 00:54:47 +0000
commit3b206ccb8393d8f2c5ad227874d9a60beb054782 (patch)
treee2e5f277cd132991dae726a137ffd190ef53cfe5
parent4d4506ad6ee6d745f57d0e701e9e8bd13144f7ca (diff)
parent533a208a851be490dae2cedf1d397fcca91efa8e (diff)
downloadgitlab-ce-3b206ccb8393d8f2c5ad227874d9a60beb054782.tar.gz
Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master'
Changed to v-cloak attr to hash rocket and string 'true' ## What does this MR do? Changed to v-cloak attr to hash rocket and string 'true' ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Maybe it's killing `master`? :confused: ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6553
-rw-r--r--app/views/discussions/_resolve_all.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml
index c77889a4d38..f0b61e0f7de 100644
--- a/app/views/discussions/_resolve_all.html.haml
+++ b/app/views/discussions/_resolve_all.html.haml
@@ -5,6 +5,6 @@
":can-resolve" => discussion.can_resolve?(current_user),
"inline-template" => true }
.btn-group{ role: "group", "v-if" => "showButton" }
- %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak": true }
+ %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" }
= icon("spinner spin", "v-show" => "loading")
{{ buttonText }}