Fix conflicts in most spec files

spec/features/boards/boards_spec.rb

@@ -19,11 +19,7 @@ describe 'Issue Boards', feature: true, js: true do
 
   context 'no lists' do
     before do
-<<<<<<< HEAD
       visit project_boards_path(project)
-=======
-      visit project_board_path(project, board)
->>>>>>> ce/master
       wait_for_requests
       expect(page).to have_selector('.board', count: 3)
     end
@@ -87,11 +83,7 @@ describe 'Issue Boards', feature: true, js: true do
     let!(:issue9) { create(:labeled_issue, project: project, labels: [planning, testing, bug, accepting], relative_position: 1) }
 
     before do
-<<<<<<< HEAD
       visit project_boards_path(project)
-=======
-      visit project_board_path(project, board)
->>>>>>> ce/master
 
       wait_for_requests
 
@@ -168,11 +160,7 @@ describe 'Issue Boards', feature: true, js: true do
         create(:labeled_issue, project: project, labels: [planning])
       end
 
-<<<<<<< HEAD
       visit project_boards_path(project)
-=======
-      visit project_board_path(project, board)
->>>>>>> ce/master
       wait_for_requests
 
       page.within(find('.board:nth-child(2)')) do
@@ -537,11 +525,7 @@ describe 'Issue Boards', feature: true, js: true do
 
   context 'keyboard shortcuts' do
     before do
-<<<<<<< HEAD
       visit project_boards_path(project)
-=======
-      visit project_board_path(project, board)
->>>>>>> ce/master
       wait_for_requests
     end
 
@@ -554,11 +538,7 @@ describe 'Issue Boards', feature: true, js: true do
   context 'signed out user' do
     before do
       gitlab_sign_out
-<<<<<<< HEAD
       visit project_boards_path(project)
-=======
-      visit project_board_path(project, board)
->>>>>>> ce/master
       wait_for_requests
     end
 
@@ -582,11 +562,7 @@ describe 'Issue Boards', feature: true, js: true do
       project.team << [user_guest, :guest]
       gitlab_sign_out
       gitlab_sign_in(user_guest)
-<<<<<<< HEAD
       visit project_boards_path(project)
-=======
-      visit project_board_path(project, board)
->>>>>>> ce/master
       wait_for_requests
     end
 

spec/features/merge_requests/edit_mr_spec.rb

@@ -9,13 +9,8 @@ feature 'Edit Merge Request', feature: true do
     before do
       project.team << [user, :master]
 
-<<<<<<< HEAD
       visit_edit_mr_page
     end
-=======
-    visit edit_project_merge_request_path(project, merge_request)
-  end
->>>>>>> ce/master
 
     it 'has class js-quick-submit in form' do
       expect(page).to have_selector('.js-quick-submit')

spec/features/projects/edit_spec.rb

@@ -9,7 +9,6 @@ feature 'Project edit', feature: true, js: true do
     gitlab_sign_in(user)
 
     visit edit_project_path(project)
-<<<<<<< HEAD
   end
 
   it 'does not have visibility radio buttons' do
@@ -25,8 +24,6 @@ feature 'Project edit', feature: true, js: true do
     wait_for_requests
 
     expect(find('#project_request_access_enabled')).to be_checked
-=======
->>>>>>> ce/master
   end
 
   context 'feature visibility' do

spec/features/projects/jobs_spec.rb

@@ -117,13 +117,10 @@ feature 'Jobs', :feature do
 
       before do
         visit project_job_path(project, job)
-<<<<<<< HEAD
-=======
       end
 
       it 'shows status name', :js do
         expect(page).to have_css('.ci-status.ci-success', text: 'passed')
->>>>>>> ce/master
       end
 
       it 'shows commit`s data' do

spec/features/security/project/private_access_spec.rb

@@ -118,23 +118,6 @@ describe "Private Project Access", feature: true  do
 
   describe "GET /:project_path/settings/repository" do
     subject { project_settings_repository_path(project) }
-<<<<<<< HEAD
-
-    it { is_expected.to be_allowed_for(:admin) }
-    it { is_expected.to be_allowed_for(:owner).of(project) }
-    it { is_expected.to be_allowed_for(:master).of(project) }
-    it { is_expected.to be_denied_for(:developer).of(project) }
-    it { is_expected.to be_denied_for(:reporter).of(project) }
-    it { is_expected.to be_denied_for(:guest).of(project) }
-    it { is_expected.to be_denied_for(:user) }
-    it { is_expected.to be_denied_for(:visitor) }
-    it { is_expected.to be_denied_for(:external) }
-  end
-
-  describe "GET /:project_path/settings/repository" do
-    subject { project_settings_repository_path(project) }
-=======
->>>>>>> ce/master
 
     it { is_expected.to be_allowed_for(:admin) }
     it { is_expected.to be_allowed_for(:owner).of(project) }

spec/mailers/notify_spec.rb

@@ -330,7 +330,6 @@ describe Notify do
               is_expected.to have_body_text(status)
               is_expected.to have_html_escaped_body_text(current_user.name)
               is_expected.to have_body_text(project_merge_request_path(project, merge_request))
-<<<<<<< HEAD
             end
           end
         end
@@ -377,8 +376,6 @@ describe Notify do
           context 'when merge request has no assignee' do
             before do
               merge_request.update(assignee: nil)
-=======
->>>>>>> ce/master
             end
 
             it 'does not show the assignee' do

spec/models/concerns/issuable_spec.rb

@@ -156,7 +156,6 @@ describe Issuable do
 
   describe "#sort" do
     let(:project) { create(:empty_project) }
-<<<<<<< HEAD
 
     context "by weight" do
       let!(:issue)  { create(:issue, project: project) }
@@ -174,8 +173,6 @@ describe Issuable do
         expect(issues).to match_array([issue2, issue3, issue4, issue])
       end
     end
-=======
->>>>>>> ce/master
 
     context "by milestone due date" do
       # Correct order is:

spec/models/forked_project_link_spec.rb

@@ -33,17 +33,10 @@ describe ForkedProjectLink, "add link on fork" do
     expect(project_to.forked_from_project).to eq(project_from)
   end
 
-<<<<<<< HEAD
-describe '#forked?' do
-  let(:forked_project_link) { create(:forked_project_link) }
-  let(:project_from) { create(:project, :repository) }
-  let(:project_to) { create(:project, forked_project_link: forked_project_link) }
-=======
   context 'project_to is pending_delete' do
     before do
       project_to.update!(pending_delete: true)
     end
->>>>>>> ce/master
 
     it { expect(project_from.forks.count).to eq(0) }
   end
@@ -56,12 +49,6 @@ describe '#forked?' do
     it { expect(project_to.forked_from_project).to be_nil }
   end
 
-<<<<<<< HEAD
-  it "project_to.destroy destroys fork_link" do
-    project_to.destroy
-
-    expect(ForkedProjectLink.exists?(id: forked_project_link.id)).to eq(false)
-=======
   describe '#forked?' do
     let(:project_to) { create(:project, forked_project_link: forked_project_link) }
     let(:forked_project_link) { create(:forked_project_link) }
@@ -94,6 +81,5 @@ describe '#forked?' do
     allow(service).to receive(:gitlab_shell).and_return(shell)
 
     service.execute
->>>>>>> ce/master
   end
 end