Add latest changes from gitlab-org/gitlab@master

11 files changed, 47 insertions, 44 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 3a2f2078e44..43f44370af8 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -12,7 +12,6 @@ import axios from './lib/utils/axios_utils';
 import { isInVueNoteablePage } from './lib/utils/dom_utils';
 import { __ } from './locale';
 
-window.axios = axios;
 const animationEndEventString = 'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd';
 const transitionEndEventString = 'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd';
 
diff --git a/app/assets/javascripts/behaviors/date_picker.js b/app/assets/javascripts/behaviors/date_picker.js
new file mode 100644
index 00000000000..efd89ec4330
--- /dev/null
+++ b/app/assets/javascripts/behaviors/date_picker.js
@@ -0,0 +1,33 @@
+import $ from 'jquery';
+import Pikaday from 'pikaday';
+import { parsePikadayDate, pikadayToString } from '~/lib/utils/datetime_utility';
+
+export default function initDatePickers() {
+  $('.datepicker').each(function initPikaday() {
+    const $datePicker = $(this);
+    const datePickerVal = $datePicker.val();
+
+    const calendar = new Pikaday({
+      field: $datePicker.get(0),
+      theme: 'gitlab-theme animate-picker',
+      format: 'yyyy-mm-dd',
+      container: $datePicker.parent().get(0),
+      parse: (dateString) => parsePikadayDate(dateString),
+      toString: (date) => pikadayToString(date),
+      onSelect(dateText) {
+        $datePicker.val(calendar.toString(dateText));
+      },
+      firstDay: gon.first_day_of_week,
+    });
+
+    calendar.setDate(parsePikadayDate(datePickerVal));
+
+    $datePicker.data('pikaday', calendar);
+  });
+
+  $('.js-clear-due-date,.js-clear-start-date').on('click', (e) => {
+    e.preventDefault();
+    const calendar = $(e.target).siblings('.datepicker').data('pikaday');
+    calendar.setDate(null);
+  });
+}
diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js
index 1f57d73d3d3..aa223270f2c 100644
--- a/app/assets/javascripts/due_date_select.js
+++ b/app/assets/javascripts/due_date_select.js
@@ -2,6 +2,7 @@
 import dateFormat from 'dateformat';
 import $ from 'jquery';
 import Pikaday from 'pikaday';
+import initDatePicker from '~/behaviors/date_picker';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 import { __ } from '~/locale';
 import boardsStore from './boards/stores/boards_store';
@@ -168,40 +169,10 @@ class DueDateSelect {
 
 export default class DueDateSelectors {
   constructor() {
-    this.initMilestoneDatePicker();
+    initDatePicker();
     this.initIssuableSelect();
   }
   // eslint-disable-next-line class-methods-use-this
-  initMilestoneDatePicker() {
-    $('.datepicker').each(function initPikadayMilestone() {
-      const $datePicker = $(this);
-      const datePickerVal = $datePicker.val();
-
-      const calendar = new Pikaday({
-        field: $datePicker.get(0),
-        theme: 'gitlab-theme animate-picker',
-        format: 'yyyy-mm-dd',
-        container: $datePicker.parent().get(0),
-        parse: (dateString) => parsePikadayDate(dateString),
-        toString: (date) => pikadayToString(date),
-        onSelect(dateText) {
-          $datePicker.val(calendar.toString(dateText));
-        },
-        firstDay: gon.first_day_of_week,
-      });
-
-      calendar.setDate(parsePikadayDate(datePickerVal));
-
-      $datePicker.data('pikaday', calendar);
-    });
-
-    $('.js-clear-due-date,.js-clear-start-date').on('click', (e) => {
-      e.preventDefault();
-      const calendar = $(e.target).siblings('.datepicker').data('pikaday');
-      calendar.setDate(null);
-    });
-  }
-  // eslint-disable-next-line class-methods-use-this
   initIssuableSelect() {
     const $loading = $('.js-issuable-update .due_date')
       .find('.block-loading')
diff --git a/app/assets/javascripts/init_issuable_sidebar.js b/app/assets/javascripts/init_issuable_sidebar.js
index 59038b3d9fb..17c73fdf1c3 100644
--- a/app/assets/javascripts/init_issuable_sidebar.js
+++ b/app/assets/javascripts/init_issuable_sidebar.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-new */
 
 import { mountSidebarLabels, getSidebarOptions } from '~/sidebar/mount_sidebar';
-import DueDateSelectors from './due_date_select';
 import IssuableContext from './issuable_context';
 import LabelsSelect from './labels_select';
 import MilestoneSelect from './milestone_select';
@@ -19,7 +18,6 @@ export default () => {
   });
   new LabelsSelect();
   new IssuableContext(sidebarOptions.currentUser);
-  new DueDateSelectors();
   Sidebar.initialize();
 
   mountSidebarLabels();
diff --git a/app/assets/javascripts/logs/stores/actions.js b/app/assets/javascripts/logs/stores/actions.js
index e813f91d2fa..c3dc9f4bc12 100644
--- a/app/assets/javascripts/logs/stores/actions.js
+++ b/app/assets/javascripts/logs/stores/actions.js
@@ -127,7 +127,7 @@ export const fetchEnvironments = ({ commit, dispatch }, environmentsPath) => {
   return axios
     .get(environmentsPath)
     .then(({ data }) => {
-      commit(types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS, data.environments);
+      commit(types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS, data);
       dispatch('fetchLogs', tracking.ENVIRONMENT_SELECTED);
     })
     .catch(() => {
diff --git a/app/assets/javascripts/pages/groups/milestones/edit/index.js b/app/assets/javascripts/pages/groups/milestones/edit/index.js
index 364b0d95d9c..4f8514a9a1d 100644
--- a/app/assets/javascripts/pages/groups/milestones/edit/index.js
+++ b/app/assets/javascripts/pages/groups/milestones/edit/index.js
@@ -1,3 +1,3 @@
-import initForm from '../../../../shared/milestones/form';
+import initForm from '~/shared/milestones/form';
 
 initForm();
diff --git a/app/assets/javascripts/pages/groups/milestones/new/index.js b/app/assets/javascripts/pages/groups/milestones/new/index.js
index 364b0d95d9c..4f8514a9a1d 100644
--- a/app/assets/javascripts/pages/groups/milestones/new/index.js
+++ b/app/assets/javascripts/pages/groups/milestones/new/index.js
@@ -1,3 +1,3 @@
-import initForm from '../../../../shared/milestones/form';
+import initForm from '~/shared/milestones/form';
 
 initForm();
diff --git a/app/assets/javascripts/pages/groups/settings/repository/show/index.js b/app/assets/javascripts/pages/groups/settings/repository/show/index.js
index 92405f205cb..f048955dadf 100644
--- a/app/assets/javascripts/pages/groups/settings/repository/show/index.js
+++ b/app/assets/javascripts/pages/groups/settings/repository/show/index.js
@@ -1,7 +1,8 @@
-import DueDateSelectors from '~/due_date_select';
+import initDatePicker from '~/behaviors/date_picker';
 import initSettingsPanels from '~/settings_panels';
 
 // Initialize expandable settings panels
 initSettingsPanels();
 
-new DueDateSelectors(); // eslint-disable-line no-new
+// Used for deploy tokens "expires at" field
+initDatePicker();
diff --git a/app/assets/javascripts/pages/projects/milestones/new/index.js b/app/assets/javascripts/pages/projects/milestones/new/index.js
index 364b0d95d9c..4f8514a9a1d 100644
--- a/app/assets/javascripts/pages/projects/milestones/new/index.js
+++ b/app/assets/javascripts/pages/projects/milestones/new/index.js
@@ -1,3 +1,3 @@
-import initForm from '../../../../shared/milestones/form';
+import initForm from '~/shared/milestones/form';
 
 initForm();
diff --git a/app/assets/javascripts/pages/projects/settings/repository/form.js b/app/assets/javascripts/pages/projects/settings/repository/form.js
index 8d390c8586b..380091a3501 100644
--- a/app/assets/javascripts/pages/projects/settings/repository/form.js
+++ b/app/assets/javascripts/pages/projects/settings/repository/form.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-new */
 
+import initDatePicker from '~/behaviors/date_picker';
 import initDeployKeys from '~/deploy_keys';
-import DueDateSelectors from '~/due_date_select';
 import fileUpload from '~/lib/utils/file_upload';
 import ProtectedBranchCreate from '~/protected_branches/protected_branch_create';
 import ProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list';
@@ -16,6 +16,6 @@ export default () => {
   initSettingsPanels();
   new ProtectedBranchCreate({ hasLicense: false });
   new ProtectedBranchEditList();
-  new DueDateSelectors();
+  initDatePicker(); // Used for deploy token "expires at" field
   fileUpload('.js-choose-file', '.js-object-map-input');
 };
diff --git a/app/assets/javascripts/shared/milestones/form.js b/app/assets/javascripts/shared/milestones/form.js
index 467cd321fb8..3ca9288b156 100644
--- a/app/assets/javascripts/shared/milestones/form.js
+++ b/app/assets/javascripts/shared/milestones/form.js
@@ -1,11 +1,12 @@
 import $ from 'jquery';
-import DueDateSelectors from '../../due_date_select';
+import initDatePicker from '~/behaviors/date_picker';
 import GLForm from '../../gl_form';
 import ZenMode from '../../zen_mode';
 
 export default (initGFM = true) => {
   new ZenMode(); // eslint-disable-line no-new
-  new DueDateSelectors(); // eslint-disable-line no-new
+  initDatePicker();
+
   // eslint-disable-next-line no-new
   new GLForm($('.milestone-form'), {
     emojis: true,