Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 5 deletions

diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
index 85443843684..fd8b1a6290f 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
@@ -39,6 +39,11 @@ export default {
       required: false,
       default: '',
     },
+    sendNativeErrors: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
   data() {
     return {
@@ -114,9 +119,11 @@ export default {
     cronInterval() {
       // updates field validation state when model changes, as
       // glFieldError only updates on input.
-      this.$nextTick(() => {
-        gl.pipelineScheduleFieldErrors.updateFormValidityState();
-      });
+      if (this.sendNativeErrors) {
+        this.$nextTick(() => {
+          gl.pipelineScheduleFieldErrors.updateFormValidityState();
+        });
+      }
     },
     radioValue: {
       immediate: true,
diff --git a/app/assets/javascripts/pages/projects/tags/new/index.js b/app/assets/javascripts/pages/projects/tags/new/index.js
index 9ef1017f9f2..eb1f705eab9 100644
--- a/app/assets/javascripts/pages/projects/tags/new/index.js
+++ b/app/assets/javascripts/pages/projects/tags/new/index.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
 import GLForm from '~/gl_form';
-import RefSelectDropdown from '~/ref_select_dropdown';
 import ZenMode from '~/zen_mode';
+import initNewTagRefSelector from '~/tags/init_new_tag_ref_selector';
 
+initNewTagRefSelector();
 new ZenMode(); // eslint-disable-line no-new
 new GLForm($('.tag-form')); // eslint-disable-line no-new
-new RefSelectDropdown($('.js-branch-select')); // eslint-disable-line no-new