Add latest changes from gitlab-org/gitlab@master

8 files changed, 25 insertions, 36 deletions

diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
index a2f0e2c2653..ebc68bafb9a 100644
--- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
@@ -3,6 +3,7 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import { s__, __ } from '~/locale';
 import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
+import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import MultilineCommentForm from '~/notes/components/multiline_comment_form.vue';
 import { commentLineOptions, formatLineRange } from '~/notes/components/multiline_comment_utils';
@@ -175,7 +176,10 @@ export default {
       'saveDiffDiscussion',
       'setSuggestPopoverDismissed',
     ]),
-    async handleCancelCommentForm(shouldConfirm, isDirty) {
+    handleCancelCommentForm: ignoreWhilePending(async function handleCancelCommentForm(
+      shouldConfirm,
+      isDirty,
+    ) {
       if (shouldConfirm && isDirty) {
         const msg = s__('Notes|Are you sure you want to cancel creating this comment?');
 
@@ -195,7 +199,7 @@ export default {
       this.$nextTick(() => {
         this.resetAutoSave();
       });
-    },
+    }),
     handleSaveNote(note) {
       return this.saveDiffDiscussion({ note, formData: this.formData }).then(() =>
         this.handleCancelCommentForm(),
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 2f3cdc525a7..e3e8efdd771 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -299,3 +299,10 @@ if (flashContainer && flashContainer.children.length) {
 $('.gl-show-field-errors').each((i, form) => new GlFieldErrors(form));
 
 requestIdleCallback(deferredInitialisation);
+
+// initialize hiding of tooltip after clicking on dropdown's links and buttons
+document
+  .querySelectorAll('a[data-toggle="dropdown"], button[data-toggle="dropdown"]')
+  .forEach((element) => {
+    element.addEventListener('click', () => tooltips.hide(element));
+  });
diff --git a/app/assets/stylesheets/notify_enhanced.scss b/app/assets/stylesheets/notify_enhanced.scss
index a366498ea03..b331d997a97 100644
--- a/app/assets/stylesheets/notify_enhanced.scss
+++ b/app/assets/stylesheets/notify_enhanced.scss
@@ -32,10 +32,6 @@ body {
   font-size: inherit;
 }
 
-a {
-  text-decoration: none;
-}
-
 .gl-mb-5 {
   @include gl-mb-5;
 }
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 0d3ed0e7c71..543ae1df1af 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -218,10 +218,6 @@ $tabs-holder-z-index: 250;
 .epic-tabs-holder {
   top: $header-height;
   z-index: $tabs-holder-z-index;
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-  padding-left: $gl-padding;
-  padding-right: $gl-padding;
   background-color: $body-bg;
   border-bottom: 1px solid $border-color;
 
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index fd85ff894a7..815a41d1e99 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -367,29 +367,3 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
   -webkit-backdrop-filter: blur(2px); // still required by Safari
 }
 
-/*
- * The below style will be moved to @gitlab/ui by
- * https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1792
- */
-.gl-text-purple-800 {
-  color: $purple-800;
-}
-
-.gl-bg-theme-indigo-800 {
-  background-color: $theme-indigo-800;
-}
-
-.gl-border-indigo-700 {
-  border-color: $theme-indigo-700;
-}
-
-.gl-border-gray-75 {
-  border-color: $gl-text-color-quaternary;
-}
-
-.gl-min-h-8 {
-  min-height: $gl-spacing-scale-8;
-}
-
-/* End gitlab-ui#1751 */
-
diff --git a/app/graphql/mutations/ci/runner/update.rb b/app/graphql/mutations/ci/runner/update.rb
index faccd1273e5..b6d8c20c40b 100644
--- a/app/graphql/mutations/ci/runner/update.rb
+++ b/app/graphql/mutations/ci/runner/update.rb
@@ -18,6 +18,10 @@ module Mutations
                  required: false,
                  description: 'Description of the runner.'
 
+        argument :maintenance_note, GraphQL::Types::String,
+                 required: false,
+                 description: 'Runner\'s maintenance notes.'
+
         argument :maximum_timeout, GraphQL::Types::Int,
                  required: false,
                  description: 'Maximum timeout (in seconds) for jobs processed by the runner.'
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index 3b979f69cac..d9f16a89fbc 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -5,6 +5,10 @@
       GitLab
     - if Feature.enabled?(:enhanced_notify_css)
       = stylesheet_link_tag 'notify_enhanced'
+      %style{ type: 'text/css', 'data-premailer': 'ignore' }
+        -# The MUA automatically turns some text into links.
+        -# Match the color of explicit links ($blue-600 from typography.scss).
+        a { color: #1068bf; }
     - else
       = stylesheet_link_tag 'notify'
     = yield :head
diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml
index a838ba91d26..bab7bc6b9da 100644
--- a/app/views/layouts/service_desk.html.haml
+++ b/app/views/layouts/service_desk.html.haml
@@ -7,6 +7,10 @@
     -# haml-lint:enable NoPlainNodes
     - if Feature.enabled?(:enhanced_notify_css)
       = stylesheet_link_tag 'notify_enhanced'
+      %style{ type: 'text/css', 'data-premailer': 'ignore' }
+        -# The MUA automatically turns some text into links.
+        -# Match the color of explicit links ($blue-600 from typography.scss).
+        a { color: #1068bf; }
     - else
       = stylesheet_link_tag 'notify'
     = yield :head