Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 12 deletions

diff --git a/spec/javascripts/collapsed_sidebar_todo_spec.js b/spec/javascripts/collapsed_sidebar_todo_spec.js
index f75d63c8f57..f2eb08fa198 100644
--- a/spec/javascripts/collapsed_sidebar_todo_spec.js
+++ b/spec/javascripts/collapsed_sidebar_todo_spec.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-new */
-import _ from 'underscore';
+import { clone } from 'lodash';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import Sidebar from '~/right_sidebar';
@@ -24,13 +24,13 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
     mock = new MockAdapter(axios);
 
     mock.onPost(`${gl.TEST_HOST}/frontend-fixtures/issues-project/todos`).reply(() => {
-      const response = _.clone(todoData);
+      const response = clone(todoData);
 
       return [200, response];
     });
 
     mock.onDelete(/(.*)\/dashboard\/todos\/\d+$/).reply(() => {
-      const response = _.clone(todoData);
+      const response = clone(todoData);
       delete response.delete_path;
 
       return [200, response];
diff --git a/spec/javascripts/dirty_submit/dirty_submit_form_spec.js b/spec/javascripts/dirty_submit/dirty_submit_form_spec.js
index b1017e0c4f0..2907d038390 100644
--- a/spec/javascripts/dirty_submit/dirty_submit_form_spec.js
+++ b/spec/javascripts/dirty_submit/dirty_submit_form_spec.js
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import { range as rge } from 'lodash';
 import DirtySubmitForm from '~/dirty_submit/dirty_submit_form';
 import { getInputValue, setInputValue, createForm } from './helper';
 
@@ -82,7 +82,7 @@ describe('DirtySubmitForm', () => {
       const { form, input } = createForm();
       const updateDirtyInputSpy = spyOn(new DirtySubmitForm(form), 'updateDirtyInput');
 
-      _.range(10).forEach(i => {
+      rge(10).forEach(i => {
         setInputValue(input, `change ${i}`, false);
       });
 
@@ -93,7 +93,7 @@ describe('DirtySubmitForm', () => {
 
     it('does not throttle updates when rapid changes are made to different form elements', () => {
       const form = document.createElement('form');
-      const range = _.range(10);
+      const range = rge(10);
       range.forEach(i => {
         form.innerHTML += `<input type="text" name="input-${i}" class="js-input-${i}"/>`;
       });
diff --git a/spec/javascripts/labels_issue_sidebar_spec.js b/spec/javascripts/labels_issue_sidebar_spec.js
index 9d05bdeee20..94e833ec83b 100644
--- a/spec/javascripts/labels_issue_sidebar_spec.js
+++ b/spec/javascripts/labels_issue_sidebar_spec.js
@@ -2,7 +2,7 @@
 
 import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
-import _ from 'underscore';
+import { shuffle } from 'lodash';
 import axios from '~/lib/utils/axios_utils';
 import IssuableContext from '~/issuable_context';
 import LabelsSelect from '~/labels_select';
@@ -27,7 +27,7 @@ function testLabelClicks(labelOrder, done) {
     expect(labelsInDropdown.length).toBe(10);
 
     const arrayOfLabels = labelsInDropdown.get();
-    const randomArrayOfLabels = _.shuffle(arrayOfLabels);
+    const randomArrayOfLabels = shuffle(arrayOfLabels);
     randomArrayOfLabels.forEach((label, i) => {
       if (i < saveLabelCount) {
         $(label).click();
diff --git a/spec/javascripts/releases/components/app_index_spec.js b/spec/javascripts/releases/components/app_index_spec.js
index 8809391f135..83b0652d59b 100644
--- a/spec/javascripts/releases/components/app_index_spec.js
+++ b/spec/javascripts/releases/components/app_index_spec.js
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import { range as rge } from 'lodash';
 import Vue from 'vue';
 import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import app from '~/releases/components/app_index.vue';
@@ -28,7 +28,7 @@ describe('Releases App ', () => {
 
   beforeEach(() => {
     store = createStore({ modules: { list: listModule } });
-    releasesPagination = _.range(21).map(index => ({
+    releasesPagination = rge(21).map(index => ({
       ...convertObjectPropsToCamelCase(release, { deep: true }),
       tagName: `${index}.00`,
     }));
diff --git a/spec/javascripts/smart_interval_spec.js b/spec/javascripts/smart_interval_spec.js
index 0f579bb32cc..0dc9ee9d79a 100644
--- a/spec/javascripts/smart_interval_spec.js
+++ b/spec/javascripts/smart_interval_spec.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import _ from 'underscore';
+import { assignIn } from 'lodash';
 import waitForPromises from 'spec/helpers/wait_for_promises';
 import SmartInterval from '~/smart_interval';
 
@@ -21,7 +21,7 @@ describe('SmartInterval', function() {
     };
 
     if (config) {
-      _.extend(defaultParams, config);
+      assignIn(defaultParams, config);
     }
 
     return new SmartInterval(defaultParams);