Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 20 deletions

diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js
index b839a994455..0c194d67bce 100644
--- a/app/assets/javascripts/lib/utils/text_utility.js
+++ b/app/assets/javascripts/lib/utils/text_utility.js
@@ -36,25 +36,26 @@ export const humanize = string =>
 export const dasherize = str => str.replace(/[_\s]+/g, '-');
 
 /**
- * Replaces whitespaces with hyphens, convert to lower case and remove non-allowed special characters
- * @param {String} str
+ * Replaces whitespace and non-sluggish characters with a given separator
+ * @param {String} str - The string to slugify
+ * @param {String=} separator - The separator used to separate words (defaults to "-")
  * @returns {String}
  */
-export const slugify = str => {
+export const slugify = (str, separator = '-') => {
   const slug = str
     .trim()
     .toLowerCase()
-    .replace(/[^a-zA-Z0-9_.-]+/g, '-');
+    .replace(/[^a-zA-Z0-9_.-]+/g, separator);
 
-  return slug === '-' ? '' : slug;
+  return slug === separator ? '' : slug;
 };
 
 /**
- * Replaces whitespaces with underscore and converts to lower case
+ * Replaces whitespace and non-sluggish characters with underscores
  * @param {String} str
  * @returns {String}
  */
-export const slugifyWithUnderscore = str => str.toLowerCase().replace(/\s+/g, '_');
+export const slugifyWithUnderscore = str => slugify(str, '_');
 
 /**
  * Truncates given text
diff --git a/app/assets/javascripts/monitoring/components/date_time_picker/date_time_picker.vue b/app/assets/javascripts/monitoring/components/date_time_picker/date_time_picker.vue
index 46d8f61cab6..8749019c5cd 100644
--- a/app/assets/javascripts/monitoring/components/date_time_picker/date_time_picker.vue
+++ b/app/assets/javascripts/monitoring/components/date_time_picker/date_time_picker.vue
@@ -55,10 +55,12 @@ export default {
       };
     },
   },
-  mounted() {
-    this.verifyTimeRange();
+  watch: {
+    selectedTimeWindow() {
+      this.verifyTimeRange();
+    },
   },
-  updated() {
+  mounted() {
     this.verifyTimeRange();
   },
   methods: {
diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js
index 52361e963bc..918c6e408a2 100644
--- a/app/assets/javascripts/new_branch_form.js
+++ b/app/assets/javascripts/new_branch_form.js
@@ -72,16 +72,14 @@ export default class NewBranchForm {
       });
       return `${restriction.prefix} ${formatted.join(restriction.conjunction)}`;
     };
-    const validator = (function(_this) {
-      return function(errors, restriction) {
-        const matched = _this.name.val().match(restriction.pattern);
-        if (matched) {
-          return errors.concat(formatter(matched.reduce(unique, []), restriction));
-        } else {
-          return errors;
-        }
-      };
-    })(this);
+    const validator = (errors, restriction) => {
+      const matched = this.name.val().match(restriction.pattern);
+      if (matched) {
+        return errors.concat(formatter(matched.reduce(unique, []), restriction));
+      } else {
+        return errors;
+      }
+    };
     const errors = this.restrictions.reduce(validator, []);
     if (errors.length > 0) {
       const errorMessage = $('<span/>').text(errors.join(', '));