[CE->EE][ci skip] Resolve conflicts

spec/requests/api/groups_spec.rb

@@ -291,7 +291,6 @@ describe API::Groups do
         put api('/groups/1328', user1), name: new_group_name
 
         expect(response).to have_gitlab_http_status(404)
-<<<<<<< HEAD
       end
 
       # EE
@@ -311,8 +310,6 @@ describe API::Groups do
         end.not_to change { group1.shared_runners_minutes_limit }
 
         expect(response).to have_gitlab_http_status(200)
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
     end
 
@@ -551,7 +548,6 @@ describe API::Groups do
         post api("/groups", user3), { name: 'test' }
 
         expect(response).to have_gitlab_http_status(400)
-<<<<<<< HEAD
       end
 
       it "creates an ldap_group_link if ldap_cn and ldap_access are supplied" do
@@ -588,8 +584,6 @@ describe API::Groups do
             expect(json_response['shared_runners_minutes_limit']).to eq(133)
           end
         end
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
     end
   end

spec/requests/api/jobs_spec.rb

@@ -317,15 +317,14 @@ describe API::Jobs do
           end
         end
 
-<<<<<<< HEAD
         it 'does not return job artifacts if not uploaded' do
           expect(response).to have_gitlab_http_status(404)
-=======
+        end
+
         it 'returns specific job artifacts' do
           expect(response).to have_gitlab_http_status(200)
           expect(response.headers).to include(download_headers)
           expect(response.body).to match_file(job.artifacts_file.file.file)
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
         end
       end
     end
@@ -352,7 +351,6 @@ describe API::Jobs do
         end
       end
 
-<<<<<<< HEAD
       context 'feature is disabled for EES' do
         let(:api_user) { user }
         let(:cross_project_pipeline_enabled) { false }
@@ -361,10 +359,10 @@ describe API::Jobs do
           expect(response).to have_gitlab_http_status(404)
         end
       end
-=======
+    end
+
     it 'does not return job artifacts if not uploaded' do
       expect(response).to have_gitlab_http_status(404)
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
     end
   end
 
@@ -441,7 +439,6 @@ describe API::Jobs do
           it { expect(response.headers).to include(download_headers) }
         end
 
-<<<<<<< HEAD
         context 'when artifacts are stored remotely' do
           let(:job) { create(:ci_build, :artifacts, :remote_store, pipeline: pipeline, user: api_user) }
 
@@ -449,10 +446,9 @@ describe API::Jobs do
             expect(response).to have_gitlab_http_status(302)
           end
         end
-=======
+
         it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.headers).to include(download_headers) }
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
 
       context 'with regular branch' do

spec/requests/api/projects_spec.rb

@@ -1357,7 +1357,6 @@ describe API::Projects do
         delete api("/projects/#{project.id}/share/#{group.id}", user)
 
         expect(response).to have_gitlab_http_status(204)
-<<<<<<< HEAD
         expect(project.project_group_links).to be_empty
       end
 
@@ -1365,8 +1364,6 @@ describe API::Projects do
         delete api("/projects/#{project.id}/share/#{group.id}", user)
 
         expect(response).to have_gitlab_http_status(204)
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
         expect(project.project_group_links).to be_empty
       end
 

spec/requests/api/runner_spec.rb

@@ -1169,7 +1169,6 @@ describe API::Runner do
           let(:job) { create(:ci_build, :artifacts) }
 
           context 'when using job token' do
-<<<<<<< HEAD
             context 'when artifacts are stored locally' do
               let(:download_headers) do
                 { 'Content-Transfer-Encoding' => 'binary',
@@ -1188,11 +1187,11 @@ describe API::Runner do
               it 'download artifacts' do
                 expect(response).to have_gitlab_http_status(302)
               end
-=======
+            end
+
             it 'download artifacts' do
               expect(response).to have_gitlab_http_status(200)
               expect(response.headers).to include download_headers
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
             end
           end
 

spec/requests/api/settings_spec.rb

@@ -7,10 +7,7 @@ describe API::Settings, 'Settings' do
   describe "GET /application/settings" do
     it "returns application settings" do
       get api("/application/settings", admin)
-<<<<<<< HEAD
 
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)

spec/requests/api/triggers_spec.rb

@@ -126,7 +126,6 @@ describe API::Triggers do
           end.to change(project.builds, :count).by(4)
 
           expect(response).to have_gitlab_http_status(201)
-<<<<<<< HEAD
         end
       end
     end
@@ -217,8 +216,6 @@ describe API::Triggers do
               expect(Ci::Pipeline.last.variables.map { |v| { v.key => v.value } }.last).to eq(params[:variables])
             end
           end
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
         end
       end
     end

spec/requests/api/users_spec.rb

@@ -595,7 +595,6 @@ describe API::Users do
         end.not_to change { user.reload.attributes }
 
         expect(response).to have_gitlab_http_status(403)
-<<<<<<< HEAD
       end
 
       it "cannot update their own shared_runners_minutes_limit" do
@@ -604,8 +603,6 @@ describe API::Users do
         end.not_to change { user.reload.shared_runners_minutes_limit }
 
         expect(response).to have_gitlab_http_status(403)
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
     end
 

spec/requests/api/v3/builds_spec.rb

@@ -214,18 +214,17 @@ describe API::V3::Builds do
         end
       end
 
-<<<<<<< HEAD
       context 'when artifacts are stored remotely' do
         let(:build) { create(:ci_build, :artifacts, :remote_store, pipeline: pipeline) }
 
         it 'returns location redirect' do
           expect(response).to have_gitlab_http_status(302)
-=======
+        end
+
         it 'returns specific job artifacts' do
           expect(response).to have_gitlab_http_status(200)
           expect(response.headers).to include(download_headers)
           expect(response.body).to match_file(build.artifacts_file.file.file)
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
         end
       end
 
@@ -315,7 +314,6 @@ describe API::V3::Builds do
           it { expect(response.headers).to include(download_headers) }
         end
 
-<<<<<<< HEAD
         context 'when artifacts are stored remotely' do
           let(:build) { create(:ci_build, :artifacts, :remote_store, pipeline: pipeline) }
 
@@ -323,10 +321,9 @@ describe API::V3::Builds do
             expect(response).to have_gitlab_http_status(302)
           end
         end
-=======
+
         it { expect(response).to have_gitlab_http_status(200) }
         it { expect(response.headers).to include(download_headers) }
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
 
       context 'with regular branch' do

spec/requests/api/v3/groups_spec.rb

@@ -33,7 +33,6 @@ describe API::V3::Groups do
         get v3_api("/groups", user1)
 
         expect(response).to have_gitlab_http_status(200)
-<<<<<<< HEAD
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response)
@@ -165,8 +164,6 @@ describe API::V3::Groups do
         get v3_api("/groups", user1)
 
         expect(response).to have_gitlab_http_status(200)
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
         expect(json_response)
@@ -415,7 +412,6 @@ describe API::V3::Groups do
         put v3_api("/groups/#{group2.id}", user1), name: new_group_name
 
         expect(response).to have_gitlab_http_status(404)
-<<<<<<< HEAD
       end
     end
 
@@ -427,8 +423,6 @@ describe API::V3::Groups do
 
         expect(response.status).to eq(200)
         expect(group2.reload.name).to eq('Renamed')
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
     end
   end
@@ -600,14 +594,12 @@ describe API::V3::Groups do
         post v3_api("/groups", user3), { name: 'test' }
 
         expect(response).to have_gitlab_http_status(400)
-<<<<<<< HEAD
       end
 
       it "creates an ldap_group_link if ldap_cn and ldap_access are supplied" do
         group_attributes = attributes_for(:group, ldap_cn: 'ldap-group', ldap_access: Gitlab::Access::DEVELOPER)
+
         expect { post v3_api("/groups", admin), group_attributes }.to change { LdapGroupLink.count }.by(1)
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       end
     end
   end

spec/requests/api/v3/merge_requests_spec.rb

@@ -540,7 +540,6 @@ describe API::MergeRequests do
       put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), sha: merge_request.diff_head_sha
 
       expect(response).to have_gitlab_http_status(200)
-<<<<<<< HEAD
     end
 
     it "updates the MR's squash attribute" do
@@ -549,8 +548,6 @@ describe API::MergeRequests do
       end.to change { merge_request.reload.squash }
 
       expect(response).to have_gitlab_http_status(200)
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
     end
 
     it "enables merge when pipeline succeeds if the pipeline is active" do
@@ -793,7 +790,6 @@ describe API::MergeRequests do
       delete v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/subscription", guest)
 
       expect(response).to have_gitlab_http_status(403)
-<<<<<<< HEAD
     end
   end
 
@@ -872,8 +868,6 @@ describe API::MergeRequests do
         expect(json_response['user_has_approved']).to be false
         expect(json_response['user_can_approve']).to be true
       end
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
     end
   end
 

spec/requests/api/v3/settings_spec.rb

@@ -7,10 +7,7 @@ describe API::V3::Settings, 'Settings' do
   describe "GET /application/settings" do
     it "returns application settings" do
       get v3_api("/application/settings", admin)
-<<<<<<< HEAD
 
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
       expect(response).to have_gitlab_http_status(200)
       expect(json_response).to be_an Hash
       expect(json_response['default_projects_limit']).to eq(42)
@@ -34,10 +31,7 @@ describe API::V3::Settings, 'Settings' do
         put v3_api("/application/settings", admin),
           default_projects_limit: 3, password_authentication_enabled: false, repository_storage: 'custom', koding_enabled: true, koding_url: 'http://koding.example.com',
           plantuml_enabled: true, plantuml_url: 'http://plantuml.example.com'
-<<<<<<< HEAD
 
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
         expect(response).to have_gitlab_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
         expect(json_response['password_authentication_enabled']).to be_falsey

spec/support/api/milestones_shared_examples.rb

@@ -229,11 +229,7 @@ shared_examples_for 'group and project milestones' do |route_definition|
       get api(issues_route, user)
 
       expect(response).to have_gitlab_http_status(200)
-<<<<<<< HEAD
       expect(response).to match_response_schema('public_api/v4/issues', dir: 'ee')
-=======
-      expect(response).to match_response_schema('public_api/v4/issues')
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
     end
 
     it 'returns a 401 error if user not authenticated' do