Resolve Gemfile and trigger_spec.rb

Gemfile

@@ -65,10 +65,7 @@ gem 'browser', '~> 2.2'
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
 gem 'gitlab_omniauth-ldap', '~> 2.0.3', require: 'omniauth-ldap'
-<<<<<<< HEAD
 gem 'net-ldap'
-=======
->>>>>>> upstream/master
 
 # Git Wiki
 # Required manually in config/initializers/gollum.rb to control load order

Gemfile.lock

@@ -500,10 +500,7 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.5)
     net-ldap (0.16.0)
-<<<<<<< HEAD
     net-ntp (2.1.3)
-=======
->>>>>>> upstream/master
     netrc (0.11.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
@@ -1023,10 +1020,7 @@ DEPENDENCIES
   google-api-client (~> 0.8.6)
   grape (~> 0.19.2)
   grape-entity (~> 0.6.0)
-<<<<<<< HEAD
   gssapi
-=======
->>>>>>> upstream/master
   grape-route-helpers (~> 2.0.0)
   haml_lint (~> 0.21.0)
   hamlit (~> 2.6.1)

spec/requests/api/triggers_spec.rb

@@ -55,12 +55,8 @@ describe API::Triggers do
         post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'other-branch')
 
         expect(response).to have_http_status(400)
-<<<<<<< HEAD
-        expect(json_response['message']).to eq('base' => ["Reference not found"])
-=======
         expect(json_response['message']['base'])
           .to contain_exactly('Reference not found')
->>>>>>> upstream/master
       end
 
       context 'Validates variables' do
@@ -97,7 +93,7 @@ describe API::Triggers do
 
         expect(response).to have_http_status(404)
       end
-  
+
       it 'creates builds from the ref given in the URL, not in the body' do
         expect do
           post api("/projects/#{project.id}/ref/master/trigger/pipeline?token=#{trigger_token}"), { ref: 'refs/heads/other-branch' }
@@ -118,7 +114,7 @@ describe API::Triggers do
         end
       end
     end
-  
+
     context 'when triggering a pipeline from a job token' do
       let(:other_job) { create(:ci_build, :running, user: other_user) }
       let(:params) { { ref: 'refs/heads/other-branch' } }
@@ -132,7 +128,7 @@ describe API::Triggers do
 
         it 'does not leak the presence of project when using valid token' do
           subject
-          
+
           expect(response).to have_http_status(404)
         end
       end