Resolve remaining conflicts for CE-to-EE 2018-01-03

app/models/project_team.rb

@@ -24,11 +24,7 @@ class ProjectTeam
   end
 
   def add_role(user, role, current_user: nil)
-<<<<<<< HEAD
     public_send(:"add_#{role}", user, current_user: current_user) # rubocop:disable GitlabSecurity/PublicSend
-=======
-    send(:"add_#{role}", user, current_user: current_user) # rubocop:disable GitlabSecurity/PublicSend
->>>>>>> upstream/master
   end
 
   def find_member(user_id)

features/steps/shared/project.rb

@@ -21,11 +21,7 @@ module SharedProject
   # Create a specific project called "Shop"
   step 'I own project "Shop"' do
     @project = Project.find_by(name: "Shop")
-<<<<<<< HEAD
     @project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace, issues_template: "This issue should contain the following.", merge_requests_template: "This merge request should contain the following.")
-=======
-    @project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace)
->>>>>>> upstream/master
     @project.add_master(@user)
   end
 

spec/controllers/projects/imports_controller_spec.rb

@@ -34,14 +34,6 @@ describe Projects::ImportsController do
     context 'when repository exists' do
       let(:project) { create(:project_empty_repo, import_url: 'https://github.com/vim/vim.git') }
 
-<<<<<<< HEAD
-=======
-      before do
-        sign_in(user)
-        project.add_master(user)
-      end
-
->>>>>>> upstream/master
       context 'when import is in progress' do
         before do
           project.update_attribute(:import_status, :started)

spec/features/issues/form_spec.rb

@@ -13,11 +13,8 @@ describe 'New/edit issue', :js do
   let!(:issue)     { create(:issue, project: project, assignees: [user], milestone: milestone) }
 
   before do
-<<<<<<< HEAD
     stub_licensed_features(multiple_issue_assignees: false, issue_weights: false)
 
-=======
->>>>>>> upstream/master
     project.add_master(user)
     project.add_master(user2)
     sign_in(user)

spec/features/merge_requests/edit_mr_spec.rb

@@ -5,14 +5,9 @@ feature 'Edit Merge Request' do
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, :simple, source_project: project) }
 
-<<<<<<< HEAD
   context 'editing a MR' do
     before do
       project.add_master(user)
-=======
-  before do
-    project.add_master(user)
->>>>>>> upstream/master
 
       sign_in user
 

spec/lib/gitlab/reference_extractor_spec.rb

@@ -5,11 +5,7 @@ describe Gitlab::ReferenceExtractor do
   let(:project) { create(:project, group: group) }
 
   before do
-<<<<<<< HEAD
     group.add_developer(project.creator)
-=======
-    project.add_developer(project.creator)
->>>>>>> upstream/master
   end
 
   subject { described_class.new(project, project.creator) }

spec/requests/api/issues_spec.rb

@@ -60,13 +60,10 @@ describe API::Issues, :mailer do
   before(:all) do
     project.add_reporter(user)
     project.add_guest(guest)
-<<<<<<< HEAD
   end
 
   before do
     stub_licensed_features(multiple_issue_assignees: false, issue_weights: false)
-=======
->>>>>>> upstream/master
   end
 
   describe "GET /issues" do

spec/services/git_push_service_spec.rb

@@ -12,7 +12,6 @@ describe GitPushService do
 
   before do
     project.add_master(user)
-<<<<<<< HEAD
   end
 
   describe 'with remote mirrors' do
@@ -79,8 +78,6 @@ describe GitPushService do
         end
       end
     end
-=======
->>>>>>> upstream/master
   end
 
   describe 'Push branches' do

spec/services/quick_actions/interpret_service_spec.rb

@@ -12,11 +12,8 @@ describe QuickActions::InterpretService do
   let(:service) { described_class.new(project, developer) }
 
   before do
-<<<<<<< HEAD
     stub_licensed_features(multiple_issue_assignees: false)
 
-=======
->>>>>>> upstream/master
     project.add_developer(developer)
   end