Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -16,7 +16,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
 
 # Supported DBs
 gem 'mysql2', '~> 0.4.10', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+gem 'pg', '~> 1.1', group: :postgres
 
 gem 'rugged', '~> 0.27'
 gem 'grape-path-helpers', '~> 1.0'

Gemfile.lock

@@ -605,7 +605,7 @@ GEM
       atomic (>= 1.0.0)
       peek
       redis
-    pg (0.18.4)
+    pg (1.1.3)
     po_to_json (1.0.1)
       json (>= 1.6.0)
     powerpack (0.1.1)
@@ -1123,7 +1123,7 @@ DEPENDENCIES
   peek-pg (~> 1.3.0)
   peek-rblineprof (~> 0.2.0)
   peek-redis (~> 1.2.0)
-  pg (~> 0.18.2)
+  pg (~> 1.1)
   premailer-rails (~> 1.9.7)
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.5.1)

spec/requests/api/merge_requests_spec.rb

@@ -1210,13 +1210,13 @@ describe API::MergeRequests do
     end
 
     it 'returns 404 if the merge request is not found' do
-      post api("/projects/#{project.id}/merge_requests/123/merge_when_pipeline_succeeds", user)
+      post api("/projects/#{project.id}/merge_requests/123/cancel_merge_when_pipeline_succeeds", user)
 
       expect(response).to have_gitlab_http_status(404)
     end
 
     it 'returns 404 if the merge request id is used instead of iid' do
-      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge_when_pipeline_succeeds", user)
+      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/cancel_merge_when_pipeline_succeeds", user)
 
       expect(response).to have_gitlab_http_status(404)
     end