Resolve the other conflicts

app/controllers/admin/application_controller.rb

@@ -8,7 +8,6 @@ class Admin::ApplicationController < ApplicationController
 
   def authenticate_admin!
     render_404 unless current_user.admin?
-<<<<<<< HEAD
   end
 
   def display_geo_information
@@ -16,7 +15,5 @@ class Admin::ApplicationController < ApplicationController
 
     primary_node = view_context.link_to('primary node', Gitlab::Geo.primary_node.url)
     flash.now[:notice] = "You are on a secondary (read-only) Geo node. If you want to make any changes, you must visit the #{primary_node}.".html_safe
-=======
->>>>>>> 9-1-stable
   end
 end

app/models/ci/build.rb

@@ -236,7 +236,6 @@ module Ci
 
     def has_trace?
       trace.exist?
-<<<<<<< HEAD
     end
 
     def trace=(data)
@@ -247,18 +246,6 @@ module Ci
       read_attribute(:trace)
     end
 
-=======
-    end
-
-    def trace=(data)
-      raise NotImplementedError
-    end
-
-    def old_trace
-      read_attribute(:trace)
-    end
-
->>>>>>> 9-1-stable
     def erase_old_trace!
       write_attribute(:trace, nil)
       save

app/models/note.rb

@@ -130,7 +130,6 @@ class Note < ActiveRecord::Base
     end
   end
 
-<<<<<<< HEAD
   def searchable?
     !system
   end
@@ -139,12 +138,6 @@ class Note < ActiveRecord::Base
     system? && SystemNoteService.cross_reference?(note)
   end
 
-=======
-  def cross_reference?
-    system? && SystemNoteService.cross_reference?(note)
-  end
-
->>>>>>> 9-1-stable
   def diff_note?
     false
   end

spec/features/admin/admin_groups_spec.rb

@@ -25,17 +25,14 @@ feature 'Admin Groups', feature: true do
       visit admin_groups_path
 
       click_link "New group"
-<<<<<<< HEAD
-      fill_in 'group_path', with: 'gitlab'
-      fill_in 'group_description', with: 'Group description'
-=======
+
       path_component = 'gitlab'
       group_name = 'GitLab group name'
       group_description = 'Description of group for GitLab'
+
       fill_in 'group_path', with: path_component
       fill_in 'group_name', with: group_name
       fill_in 'group_description', with: group_description
->>>>>>> 9-1-stable
       click_button "Create group"
 
       expect(current_path).to eq admin_group_path(Group.find_by(path: path_component))

spec/features/dashboard/group_spec.rb

@@ -8,11 +8,9 @@ RSpec.describe 'Dashboard Group', feature: true do
   it 'creates new group', js: true do
     visit dashboard_groups_path
     click_link 'New group'
-<<<<<<< HEAD
-=======
+
     new_path = 'Samurai'
     new_description = 'Tokugawa Shogunate'
->>>>>>> 9-1-stable
 
     fill_in 'group_path', with: new_path
     fill_in 'group_description', with: new_description

spec/features/issues/filtered_search/dropdown_hint_spec.rb

@@ -44,11 +44,7 @@ describe 'Dropdown hint', :js, :feature do
 
       hint_dropdown = find(js_dropdown_hint)
 
-<<<<<<< HEAD
-      expect(page).to have_css(js_dropdown_hint, text: 'Press Enter or click to search')
-=======
       expect(hint_dropdown).to have_content('Press Enter or click to search')
->>>>>>> 9-1-stable
       expect(hint_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 0)
     end
 

spec/javascripts/build_spec.js

@@ -64,7 +64,6 @@ describe('Build', () => {
       });
     });
 
-<<<<<<< HEAD
     describe('initial build trace', () => {
       beforeEach(() => {
         new Build();
@@ -94,8 +93,6 @@ describe('Build', () => {
       });
     });
 
-=======
->>>>>>> 9-1-stable
     describe('running build', () => {
       beforeEach(function () {
         this.build = new Build();

spec/models/ci/build_spec.rb

@@ -250,7 +250,6 @@ describe Ci::Build, :models do
       before do
         build.coverage_regex = '\(\d+.\d+\%\) covered'
         build.trace.set('Coverage 1033 / 1051 LOC (98.29%) covered')
-<<<<<<< HEAD
       end
 
       it "saves the correct extracted coverage value" do
@@ -319,76 +318,6 @@ describe Ci::Build, :models do
         build.project.update(runners_token: 'token')
       end
 
-=======
-      end
-
-      it "saves the correct extracted coverage value" do
-        expect(build.update_coverage).to be(true)
-        expect(build.coverage).to eq(98.29)
-      end
-    end
-  end
-
-  describe '#trace' do
-    subject { build.trace }
-
-    it { is_expected.to be_a(Gitlab::Ci::Trace) }
-  end
-
-  describe '#has_trace?' do
-    subject { build.has_trace? }
-
-    it "expect to call exist? method" do
-      expect_any_instance_of(Gitlab::Ci::Trace).to receive(:exist?)
-        .and_return(true)
-
-      is_expected.to be(true)
-    end
-  end
-
-  describe '#trace=' do
-    it "expect to fail trace=" do
-      expect { build.trace = "new" }.to raise_error(NotImplementedError)
-    end
-  end
-
-  describe '#old_trace' do
-    subject { build.old_trace }
-
-    before do
-      build.update_column(:trace, 'old trace')
-    end
-
-    it "expect to receive data from database" do
-      is_expected.to eq('old trace')
-    end
-  end
-
-  describe '#erase_old_trace!' do
-    subject { build.send(:read_attribute, :trace) }
-
-    before do
-      build.send(:write_attribute, :trace, 'old trace')
-    end
-
-    it "expect to receive data from database" do
-      build.erase_old_trace!
-
-      is_expected.to be_nil
-    end
-  end
-
-  describe '#hide_secrets' do
-    let(:subject) { build.hide_secrets(data) }
-
-    context 'hide runners token' do
-      let(:data) { 'new token data'}
-
-      before do
-        build.project.update(runners_token: 'token')
-      end
-
->>>>>>> 9-1-stable
       it { is_expected.to eq('new xxxxx data') }
     end
 

spec/models/merge_request_spec.rb

@@ -1490,7 +1490,6 @@ describe MergeRequest, models: true do
       end
     end
 
-<<<<<<< HEAD
     context 'on a project with several members' do
       let(:approver_2) { create(:user) }
       let(:developer) { create(:user) }
@@ -1688,8 +1687,6 @@ describe MergeRequest, models: true do
     end
   end
 
-=======
->>>>>>> 9-1-stable
   describe '#conflicts_can_be_resolved_in_ui?' do
     def create_merge_request(source_branch)
       create(:merge_request, source_branch: source_branch, target_branch: 'conflict-start') do |mr|