Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-17

# Conflicts:
#	spec/javascripts/environments/environments_store_spec.js
#	spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
#	spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js
#	spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js

[ci skip]

spec/javascripts/environments/environments_store_spec.js

@@ -114,7 +114,11 @@ describe('Store', () => {
     it('should store latest.name when the environment is not a folder', () => {
       store.storeEnvironments(serverData);
 
+<<<<<<< HEAD
       expect(store.state.environments[2].name).toEqual(serverData[2].latest.name);
+=======
+      expect(store.state.environments[0].name).toEqual(serverData[0].latest.name);
+>>>>>>> upstream/master
     });
 
     it('should store root level name when environment is a folder', () => {

spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js

@@ -18,6 +18,15 @@ describe('collapsedGroupedDatePicker', () => {
       Vue.nextTick(done);
     });
 
+<<<<<<< HEAD
+=======
+    it('should emit when sidebar is toggled', () => {
+      vm.$el.querySelector('.gutter-toggle').click();
+
+      expect(vm.toggleSidebar).toHaveBeenCalled();
+    });
+
+>>>>>>> upstream/master
     it('should emit when collapsed-calendar-icon is clicked', () => {
       vm.$el.querySelector('.sidebar-collapsed-icon').click();
 

spec/javascripts/vue_shared/components/sidebar/date_picker_spec.js

@@ -12,6 +12,18 @@ describe('sidebarDatePicker', () => {
     });
   });
 
+<<<<<<< HEAD
+=======
+  it('should emit toggleCollapse when collapsed toggle sidebar is clicked', () => {
+    const toggleCollapse = jasmine.createSpy();
+    vm.$on('toggleCollapse', toggleCollapse);
+
+    vm.$el.querySelector('.issuable-sidebar-header .gutter-toggle').click();
+
+    expect(toggleCollapse).toHaveBeenCalled();
+  });
+
+>>>>>>> upstream/master
   it('should render collapsed-calendar-icon', () => {
     expect(vm.$el.querySelector('.sidebar-collapsed-icon')).toBeDefined();
   });

spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js

@@ -30,7 +30,11 @@ describe('DropdownValueCollapsedComponent', () => {
       it('returns empty text when `labels` prop is empty array', () => {
         const vmEmptyLabels = createComponent([]);
 
+<<<<<<< HEAD
         expect(vmEmptyLabels.labelsList).toBe('Labels');
+=======
+        expect(vmEmptyLabels.labelsList).toBe('');
+>>>>>>> upstream/master
         vmEmptyLabels.$destroy();
       });