Merge pull request #203 from m4tthumphrey/suggested-chan

Apply #201 suggested fixes

Author: fbourigault

lib/Gitlab/Api/MergeRequests.php

@@ -235,9 +235,9 @@ public function closesIssues($project_id, $mr_id)
      *
      * @return mixed
      */
-    public function approvals($project_id, $mr_id)
+    public function approvals($project_id, $merge_request_iid)
     {
-        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/approvals'));
+        return $this->get($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($merge_request_iid).'/approvals'));
     }
 
     /**
@@ -246,9 +246,9 @@ public function approvals($project_id, $mr_id)
      *
      * @return mixed
      */
-    public function approve($project_id, $mr_id)
+    public function approve($project_id, $merge_request_iid)
     {
-        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/approve'));
+        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($merge_request_iid).'/approve'));
     }
 
     /**
@@ -257,8 +257,8 @@ public function approve($project_id, $mr_id)
      *
      * @return mixed
      */
-    public function unApprove($project_id, $mr_id)
+    public function unapprove($project_id, $merge_request_iid)
     {
-        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($mr_id).'/unapprove'));
+        return $this->post($this->getProjectPath($project_id, 'merge_requests/'.$this->encodePath($merge_request_iid).'/unapprove'));
     }
 }