diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:09:00 +0000 |
| commit | ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d (patch) | |
| tree | c53ad0fcdab26725814f1dc5267f6a04ebe4cf73 /app/views/discussions | |
| parent | 38149afcf95e7669a7a99828c579d185b70c04dc (diff) | |
| download | gitlab-ce-ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_resolve_all.html.haml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml deleted file mode 100644 index 689a22acd27..00000000000 --- a/app/views/discussions/_resolve_all.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", - ":merge-request-id" => discussion.noteable.iid, - ":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" } - = icon("spinner spin", "v-show" => "loading") - {{ buttonText }} |