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`? 😕 ## 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

Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master'
3b206ccb · Jacob Schatz · 4d4506ad · 533a208a · 3b206ccb
Commit 3b206ccb authored Sep 28, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_resolve_all.html.haml app/views/discussions/_resolve_all.html.haml +1 -1

No files found.
--- 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 }}