From 49f34e78d32a1764646f3a66ed76559840405432 Mon Sep 17 00:00:00 2001
From: Steve Newell <steve.newell@mx.com>
Date: Tue, 14 Feb 2017 16:48:29 -0700
Subject: [PATCH] Update merge_request endpoints to new merge_requests
 endpoints

Resolves https://github.com/NARKOZ/gitlab/issues/229
---
 lib/gitlab/client/merge_requests.rb       | 12 ++++++------
 spec/gitlab/client/merge_requests_spec.rb | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/gitlab/client/merge_requests.rb b/lib/gitlab/client/merge_requests.rb
index 4b4fe9749..274b7c5b3 100644
--- a/lib/gitlab/client/merge_requests.rb
+++ b/lib/gitlab/client/merge_requests.rb
@@ -26,7 +26,7 @@ def merge_requests(project, options={})
     # @param  [Integer] id The ID of a merge request.
     # @return <Gitlab::ObjectifiedHash]
     def merge_request(project, id)
-      get("/projects/#{url_encode project}/merge_request/#{id}")
+      get("/projects/#{url_encode project}/merge_requests/#{id}")
     end
 
     # Creates a merge request.
@@ -65,7 +65,7 @@ def create_merge_request(project, title, options={})
     # @option options [String] :state_event New state (close|reopen|merge).
     # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
     def update_merge_request(project, id, options={})
-      put("/projects/#{url_encode project}/merge_request/#{id}", body: options)
+      put("/projects/#{url_encode project}/merge_requests/#{id}", body: options)
     end
 
     # Accepts a merge request.
@@ -79,7 +79,7 @@ def update_merge_request(project, id, options={})
     # @option options [String] :merge_commit_message Custom merge commit message
     # @return [Gitlab::ObjectifiedHash] Information about updated merge request.
     def accept_merge_request(project, id, options={})
-      put("/projects/#{url_encode project}/merge_request/#{id}/merge", body: options)
+      put("/projects/#{url_encode project}/merge_requests/#{id}/merge", body: options)
     end
 
     # Adds a comment to a merge request.
@@ -124,7 +124,7 @@ def edit_merge_request_comment(project, id, note_id , note)
     def delete_merge_request_comment(project, id, note_id)
       delete("/projects/#{url_encode project}/merge_requests/#{id}/notes/#{note_id}")
     end
-    
+
     # Gets the comments on a merge request.
     #
     # @example
@@ -150,7 +150,7 @@ def merge_request_comments(project, id, options={})
     # @param  [Integer] id The ID of a merge request.
     # @return [Gitlab::ObjectifiedHash] The merge request's changes.
     def merge_request_changes(project, id)
-      get("/projects/#{url_encode project}/merge_request/#{id}/changes")
+      get("/projects/#{url_encode project}/merge_requests/#{id}/changes")
     end
 
     # Gets the commits of a merge request.
@@ -162,7 +162,7 @@ def merge_request_changes(project, id)
     # @param  [Integer] id The ID of a merge request.
     # @return [Array<Gitlab::ObjectifiedHash>] The merge request's commits.
     def merge_request_commits(project, id)
-      get("/projects/#{url_encode project}/merge_request/#{id}/commits")
+      get("/projects/#{url_encode project}/merge_requests/#{id}/commits")
     end
   end
 end
diff --git a/spec/gitlab/client/merge_requests_spec.rb b/spec/gitlab/client/merge_requests_spec.rb
index d22650b48..740613d0f 100644
--- a/spec/gitlab/client/merge_requests_spec.rb
+++ b/spec/gitlab/client/merge_requests_spec.rb
@@ -19,12 +19,12 @@
 
   describe ".merge_request" do
     before do
-      stub_get("/projects/3/merge_request/1", "merge_request")
+      stub_get("/projects/3/merge_requests/1", "merge_request")
       @merge_request = Gitlab.merge_request(3, 1)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/3/merge_request/1")).to have_been_made
+      expect(a_get("/projects/3/merge_requests/1")).to have_been_made
     end
 
     it "should return information about a merge request" do
@@ -50,7 +50,7 @@
 
   describe ".update_merge_request" do
     before do
-      stub_put("/projects/3/merge_request/2", "merge_request").
+      stub_put("/projects/3/merge_requests/2", "merge_request").
         with(body: {
                assignee_id: '1',
                target_branch: 'master',
@@ -64,7 +64,7 @@
     end
 
     it "should get the correct resource" do
-      expect(a_put("/projects/3/merge_request/2").
+      expect(a_put("/projects/3/merge_requests/2").
         with(body: {
                assignee_id: '1',
                target_branch: 'master',
@@ -80,13 +80,13 @@
 
   describe ".accept_merge_request" do
     before do
-      stub_put("/projects/5/merge_request/42/merge", "merge_request").
+      stub_put("/projects/5/merge_requests/42/merge", "merge_request").
         with(body: { merge_commit_message: 'Nice!' })
       @merge_request = Gitlab.accept_merge_request(5, 42, merge_commit_message: 'Nice!')
     end
 
     it "should get the correct resource" do
-      expect(a_put("/projects/5/merge_request/42/merge").
+      expect(a_put("/projects/5/merge_requests/42/merge").
         with(body: { merge_commit_message: 'Nice!' })).to have_been_made
     end
 
@@ -134,12 +134,12 @@
 
   describe ".merge_request_changes" do
     before do
-      stub_get("/projects/3/merge_request/2/changes", "merge_request_changes")
+      stub_get("/projects/3/merge_requests/2/changes", "merge_request_changes")
       @mr_changes = Gitlab.merge_request_changes(3, 2)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/3/merge_request/2/changes")).to have_been_made
+      expect(a_get("/projects/3/merge_requests/2/changes")).to have_been_made
     end
 
     it "should return the merge request changes" do
@@ -154,12 +154,12 @@
 
   describe ".merge_request_commits" do
     before do
-      stub_get("/projects/3/merge_request/2/commits", "merge_request_commits")
+      stub_get("/projects/3/merge_requests/2/commits", "merge_request_commits")
       @mr_commits = Gitlab.merge_request_commits(3, 2)
     end
 
     it "should get the correct resource" do
-      expect(a_get("/projects/3/merge_request/2/commits")).to have_been_made
+      expect(a_get("/projects/3/merge_requests/2/commits")).to have_been_made
     end
 
     it "should return the merge request commits" do