summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-09-26 22:32:49 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-09-26 22:32:49 +0000
commit045836c48d3558a1ff67fc6399d77b708e0084fb (patch)
treedb218372721b5cea804fce4f71c3520a6f06d48a
parentf590e6f1147a9fff5df350df6bae5e33f84d33de (diff)
parent51c04a2f35cd2bae4d2e82013bb23f2a1e26e394 (diff)
downloadgitlab-ce-045836c48d3558a1ff67fc6399d77b708e0084fb.tar.gz
Merge branch '22640-use-v-cloak-on-button-text' into 'master'
Added v-cloak to resolve disc button ## What does this MR do? Adds `v-cloak` to the `Resolve discussion` button to avoid handlebar syntax displaying before the component compiles. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## 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? Closes #22640 See merge request !6528
-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 7a8767ddba0..9c2ae8faaab 100644
--- a/app/views/discussions/_resolve_all.html.haml
+++ b/app/views/discussions/_resolve_all.html.haml
@@ -6,6 +6,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" }
+ %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak": true }
= icon("spinner spin", "v-show" => "loading")
{{ buttonText }}