Resolve another part of conflicts

spec/features/projects/snippets_spec.rb

@@ -29,11 +29,7 @@ describe 'Project snippets', :js, feature: true do
 
     context 'when submitting a note' do
       before do
-<<<<<<< HEAD
-        login_as :admin
-=======
         gitlab_sign_in :admin
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
         visit namespace_project_snippet_path(project.namespace, project, snippets[0])
       end
 

spec/features/projects/wiki/user_updates_wiki_page_spec.rb

@@ -5,12 +5,6 @@ feature 'Projects > Wiki > User updates wiki page', feature: true do
 
   background do
     project.team << [user, :master]
-<<<<<<< HEAD
-    gitlab_sign_in(user)
-
-    visit namespace_project_path(project.namespace, project)
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
     WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
     gitlab_sign_in(user)
 

spec/features/protected_tags_spec.rb

@@ -6,7 +6,6 @@ feature 'Projected Tags', feature: true, js: true do
 
   before do
     gitlab_sign_in(user)
-<<<<<<< HEAD
   end
 
   def set_allowed_to(operation, option = 'Masters', form: '.new-protected-tag')
@@ -18,8 +17,6 @@ feature 'Projected Tags', feature: true, js: true do
 
       find(".js-allowed-to-#{operation}").click # needed to submit form in some cases
     end
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   end
 
   def set_protected_tag_name(tag_name)

spec/features/tags/master_creates_tag_spec.rb

@@ -7,10 +7,7 @@ feature 'Master creates tag', feature: true do
   before do
     project.team << [user, :master]
     gitlab_sign_in(user)
-<<<<<<< HEAD
     visit namespace_project_tags_path(project.namespace, project)
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   end
 
   context 'from tag list' do

spec/features/triggers_spec.rb

@@ -7,11 +7,7 @@ feature 'Triggers', feature: true, js: true do
   let(:guest_user) { create(:user) }
 
   before do
-<<<<<<< HEAD
     gitlab_sign_in(user)
-=======
-    sign_in(user)
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
 
     @project = create(:empty_project)
     @project.team << [user, :master]

spec/lib/gitlab/git_access_spec.rb

@@ -8,10 +8,6 @@ describe Gitlab::GitAccess, lib: true do
   let(:user) { create(:user) }
   let(:actor) { user }
   let(:protocol) { 'ssh' }
-<<<<<<< HEAD
-
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   let(:redirected_path) { nil }
   let(:authentication_abilities) do
     [

spec/lib/gitlab/git_access_wiki_spec.rb

@@ -2,14 +2,9 @@ require 'spec_helper'
 
 describe Gitlab::GitAccessWiki, lib: true do
   let(:access) { Gitlab::GitAccessWiki.new(user, project, 'web', authentication_abilities: authentication_abilities, redirected_path: redirected_path) }
-<<<<<<< HEAD
   let!(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:changes) { ['6f6d7e7ed 570e7b2ab refs/heads/master'] }
-=======
-  let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   let(:redirected_path) { nil }
   let(:authentication_abilities) do
     [

spec/models/merge_request_spec.rb

@@ -1980,7 +1980,6 @@ describe MergeRequest, models: true do
 
         it 'is mergeable' do
           expect(merge_request.mergeable_with_quick_action?(developer, last_diff_sha: mr_sha)).to be_truthy
-<<<<<<< HEAD
         end
       end
 
@@ -1997,8 +1996,6 @@ describe MergeRequest, models: true do
           merge_request.approvals.create(user: user)
 
           expect(merge_request.mergeable_with_quick_action?(developer, last_diff_sha: mr_sha)).to be_truthy
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
         end
       end
     end

spec/requests/api/merge_requests_spec.rb

@@ -335,13 +335,9 @@ describe API::MergeRequests do
              target_branch: 'master',
              author: user,
              labels: 'label, label2',
-<<<<<<< HEAD
              milestone_id: milestone.id,
              remove_source_branch: true,
              squash: true
-=======
-             milestone_id: milestone.id
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
 
         expect(response).to have_http_status(201)
         expect(json_response['title']).to eq('Test merge_request')