Add latest changes from gitlab-org/gitlab@master

3 files changed, 49 insertions, 10 deletions

diff --git a/app/assets/javascripts/captcha/captcha_modal.vue b/app/assets/javascripts/captcha/captcha_modal.vue
index 36aa098d5ff..fd37e498699 100644
--- a/app/assets/javascripts/captcha/captcha_modal.vue
+++ b/app/assets/javascripts/captcha/captcha_modal.vue
@@ -26,10 +26,21 @@ export default {
       type: String,
       required: true,
     },
+    showModal: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    resetSession: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
       modalId: uniqueId('captcha-modal-'),
+      captcha: null,
     };
   },
   watch: {
@@ -37,29 +48,44 @@ export default {
       // If this is true, we need to present the captcha modal to the user.
       // When the modal is shown we will also initialize and render the form.
       if (newNeedsCaptchaResponse) {
-        this.$refs.modal.show();
+        this.renderCaptcha();
       }
     },
+    resetSession: {
+      immediate: true,
+      handler(reset) {
+        if (reset && this.captcha) {
+          this.resetCaptcha();
+        }
+      },
+    },
   },
   mounted() {
     // If this is true, we need to present the captcha modal to the user.
     // When the modal is shown we will also initialize and render the form.
     if (this.needsCaptchaResponse) {
-      this.$refs.modal.show();
+      this.renderCaptcha();
     }
   },
   methods: {
     emitReceivedCaptchaResponse(captchaResponse) {
-      this.$refs.modal.hide();
+      if (this.showModal) this.$refs.modal.hide();
       this.$emit('receivedCaptchaResponse', captchaResponse);
     },
     emitNullReceivedCaptchaResponse() {
       this.emitReceivedCaptchaResponse(null);
     },
+    renderCaptcha() {
+      if (this.showModal) {
+        this.$refs.modal.show();
+      } else {
+        this.initCaptcha();
+      }
+    },
     /**
      * handler for when modal is shown
      */
-    shown() {
+    initCaptcha() {
       const containerRef = this.$refs.captcha;
 
       // NOTE: This is the only bit that is specific to Google's reCAPTCHA captcha implementation.
@@ -72,12 +98,13 @@ export default {
             // TODO: Also need to handle expired-callback and error-callback
             //   See https://gitlab.com/gitlab-org/gitlab/-/issues/217722#future-follow-on-issuesmrs
           });
+
+          this.captcha = grecaptcha;
         })
         .catch((e) => {
           // TODO: flash the error or notify the user some other way
           //   See https://gitlab.com/gitlab-org/gitlab/-/issues/217722#future-follow-on-issuesmrs
           this.emitNullReceivedCaptchaResponse();
-          this.$refs.modal.hide();
 
           // eslint-disable-next-line no-console
           console.error(
@@ -96,6 +123,9 @@ export default {
         this.emitNullReceivedCaptchaResponse();
       }
     },
+    resetCaptcha() {
+      this.captcha.reset();
+    },
   },
 };
 </script>
@@ -104,17 +134,19 @@ export default {
   <!-- there must be at least one button or focusable element, or the gl-modal fails to render. -->
   <!-- We could modify gl-model to remove this requirement.                                     -->
   <gl-modal
+    v-if="showModal"
     ref="modal"
     :modal-id="modalId"
     :title="__('Please solve the captcha')"
     :action-cancel="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
       text: __('Cancel'),
     } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
-    @shown="shown"
+    @shown="initCaptcha"
     @hide="hide"
     @hidden="$emit('hidden')"
   >
     <div ref="captcha"></div>
     <p>{{ __('We want to be sure it is you, please confirm you are not a robot.') }}</p>
   </gl-modal>
+  <div v-else ref="captcha" class="gl-display-inline-block"></div>
 </template>
diff --git a/app/models/concerns/integrations/enable_ssl_verification.rb b/app/models/concerns/integrations/enable_ssl_verification.rb
index cb20955488a..1dffe183475 100644
--- a/app/models/concerns/integrations/enable_ssl_verification.rb
+++ b/app/models/concerns/integrations/enable_ssl_verification.rb
@@ -9,7 +9,8 @@ module Integrations
         type: :checkbox,
         title: -> { s_('Integrations|SSL verification') },
         checkbox_label: -> { s_('Integrations|Enable SSL verification') },
-        help: -> { s_('Integrations|Clear if using a self-signed certificate.') }
+        help: -> { s_('Integrations|Clear if using a self-signed certificate.') },
+        description: -> { s_('Enable SSL verification. Defaults to `true` (enabled).') }
     end
 
     def initialize_properties
diff --git a/app/models/integrations/bamboo.rb b/app/models/integrations/bamboo.rb
index 9fe73f86be3..1c68d09aa2f 100644
--- a/app/models/integrations/bamboo.rb
+++ b/app/models/integrations/bamboo.rb
@@ -8,12 +8,14 @@ module Integrations
     field :bamboo_url,
       title: -> { s_('BambooService|Bamboo URL') },
       placeholder: -> { s_('https://bamboo.example.com') },
-      help: -> { s_('BambooService|Bamboo service root URL.') },
+      help: -> { s_('BambooService|Bamboo root URL.') },
+      description: -> { s_('Bamboo root URL (for example, `https://bamboo.example.com`).') },
       exposes_secrets: true,
       required: true
 
     field :build_key,
       help: -> { s_('BambooService|Bamboo build plan key.') },
+      description: -> { s_('Bamboo build plan key (for example, `KEY`).') },
       non_empty_password_title: -> { s_('BambooService|Enter new build key') },
       non_empty_password_help: -> { s_('BambooService|Leave blank to use your current build key.') },
       placeholder: -> { _('KEY') },
@@ -21,12 +23,16 @@ module Integrations
       is_secret: true
 
     field :username,
-      help: -> { s_('BambooService|The user with API access to the Bamboo server.') }
+      help: -> { s_('BambooService|User with API access to the Bamboo server.') },
+      description: -> { s_('User with API access to the Bamboo server.') },
+      required: true
 
     field :password,
       type: :password,
       non_empty_password_title: -> { s_('ProjectService|Enter new password') },
-      non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current password') }
+      non_empty_password_help: -> { s_('ProjectService|Leave blank to use your current password') },
+      description: -> { s_('Password of the user.') },
+      required: true
 
     with_options if: :activated? do
       validates :bamboo_url, presence: true, public_url: true