Fix merge conflicts

app/assets/javascripts/dispatcher.js

@@ -44,11 +44,8 @@ import ProjectsList from './projects_list';
 import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
 import BlobLinePermalinkUpdater from './blob/blob_line_permalink_updater';
 import UserCallout from './user_callout';
-<<<<<<< HEAD
 
 import GeoNodes from './geo_nodes';
-=======
->>>>>>> ce/master
 
 const ShortcutsBlob = require('./shortcuts_blob');
 

app/views/admin/dashboard/index.html.haml

@@ -71,22 +71,19 @@
           = reply_email
           %span.light.pull-right
             = boolean_to_icon Gitlab::IncomingEmail.enabled?
-<<<<<<< HEAD
-        %p
-          Elasticsearch
+        - elastic = "Elasticsearch"
+        %p{ "aria-label" => "#{elastic}: status " + (current_application_settings.elasticsearch_search? ? "on" : "off") }
+          = elastic
           %span.light.pull-right
             = boolean_to_icon current_application_settings.elasticsearch_search?
-        %p
-          Geo
+        - geo = "Geo"
+        %p{ "aria-label" => "#{geo}: status " + (Gitlab::Geo.enabled? ? "on" : "off") }
+          = geo
           %span.light.pull-right
             = boolean_to_icon Gitlab::Geo.enabled?
-        %p
-          Container Registry
-=======
         - container_reg = "Container Registry"
         %p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") }
           = container_reg
->>>>>>> ce/master
           %span.light.pull-right
             = boolean_to_icon Gitlab.config.registry.enabled
 

spec/javascripts/user_callout_spec.js

@@ -9,11 +9,8 @@ describe('UserCallout', () => {
 
   beforeEach(function () {
     loadFixtures(fixtureName);
-<<<<<<< HEAD
-=======
     Cookies.remove(USER_CALLOUT_COOKIE);
 
->>>>>>> ce/master
     this.userCallout = new UserCallout();
     this.closeButton = $('.close-user-callout');
     this.userCalloutBtn = $('.user-callout-btn');
@@ -21,13 +18,6 @@ describe('UserCallout', () => {
     Cookies.set(USER_CALLOUT_COOKIE, 'false');
   });
 
-<<<<<<< HEAD
-  afterEach(function () {
-    Cookies.set(USER_CALLOUT_COOKIE, 'false');
-  });
-
-  it('shows when cookie is set to false', function () {
-=======
   it('does not show when cookie is set not defined', () => {
     expect(Cookies.get(USER_CALLOUT_COOKIE)).toBeUndefined();
     expect(this.userCalloutContainer.is(':visible')).toBe(true);
@@ -36,7 +26,6 @@ describe('UserCallout', () => {
   it('shows when cookie is set to false', () => {
     Cookies.set(USER_CALLOUT_COOKIE, 'false');
 
->>>>>>> ce/master
     expect(Cookies.get(USER_CALLOUT_COOKIE)).toBeDefined();
     expect(this.userCalloutContainer.is(':visible')).toBe(true);
   });
@@ -49,8 +38,6 @@ describe('UserCallout', () => {
   it('hides when user clicks on the "check it out" button', function () {
     this.userCalloutBtn.click();
     expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
-<<<<<<< HEAD
-=======
   });
 });
 
@@ -67,6 +54,5 @@ describe('UserCallout when cookie is present', function () {
 
   it('removes the DOM element', () => {
     expect(this.userCalloutContainer.length).toBe(0);
->>>>>>> ce/master
   });
 });

spec/services/boards/issues/list_service_spec.rb

@@ -65,12 +65,8 @@ describe Boards::Issues::ListService, services: true do
 
           issues = described_class.new(project, user, params).execute
 
-<<<<<<< HEAD
           expect(issues).to eq [opened_issue2, list1_issue2, reopened_issue1, opened_issue1]
         end
-=======
-        expect(issues).to eq [closed_issue4, closed_issue2, closed_issue5, closed_issue3, closed_issue1]
->>>>>>> ce/master
       end
     end
 
@@ -79,7 +75,7 @@ describe Boards::Issues::ListService, services: true do
 
       issues = described_class.new(project, user, params).execute
 
-      expect(issues).to eq [closed_issue4, closed_issue2, closed_issue3, closed_issue1]
+      expect(issues).to eq [closed_issue4, closed_issue2, closed_issue5, closed_issue3, closed_issue1]
     end
 
     it 'returns opened issues that have label list applied when listing issues from a label list' do