From f64a639bcfa1fc2bc89ca7db268f594306edfd7c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 16 Mar 2021 18:18:33 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-10-stable-ee

---
 app/assets/javascripts/snippets/components/edit.vue                | 5 ++++-
 .../javascripts/snippets/components/snippet_visibility_edit.vue    | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/snippets/components')

diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue
index 9f43ac36df7..bee9d7b8c2a 100644
--- a/app/assets/javascripts/snippets/components/edit.vue
+++ b/app/assets/javascripts/snippets/components/edit.vue
@@ -221,7 +221,10 @@ export default {
       this.captchaResponse = captchaResponse;
 
       if (this.captchaResponse) {
-        // If the user solved the captcha resubmit the form.
+        // If the user solved the captcha, resubmit the form.
+        // NOTE: we do not need to clear out the captchaResponse and spamLogId
+        // data values after submit, because this component always does a full page reload.
+        // Otherwise, we would need to.
         this.handleFormSubmit();
       } else {
         // If the user didn't solve the captcha (e.g. they just closed the modal),
diff --git a/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue b/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
index 18a7d4ad218..e6aa3be0371 100644
--- a/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_visibility_edit.vue
@@ -55,7 +55,12 @@ export default {
         >
           <div class="d-flex align-items-center">
             <gl-icon :size="16" :name="option.icon" />
-            <span class="font-weight-bold ml-1 js-visibility-option">{{ option.label }}</span>
+            <span
+              class="font-weight-bold ml-1 js-visibility-option"
+              data-qa-selector="visibility_content"
+              :data-qa-visibility="option.label"
+              >{{ option.label }}</span
+            >
           </div>
           <template #help>{{
             isProjectSnippet && option.description_project
-- 
cgit v1.2.1