Merge branch 'approval-integration' of gitlab.com:gitlab-org/gitlab-ee into approval-integration

app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6

@@ -18,7 +18,7 @@
 
       return Vue.http.get(this.baseEndpoint).catch((err) => {
         console.error('Error fetching approvals', err);
-        return new Flash(flashErrorMessage, 'alert');
+        return new Flash(flashErrorMessage);
       });
     }
 
@@ -27,7 +27,7 @@
 
       return Vue.http.post(this.baseEndpoint).catch((err) => {
         console.error('Error approving merge request', err);
-        return new Flash(flashErrorMessage, 'alert');
+        return new Flash(flashErrorMessage);
       });
     }
 
@@ -36,7 +36,7 @@
 
       return Vue.http.delete(this.baseEndpoint).catch((err) => {
         console.error('Error unapproving merge request', err);
-        return new Flash(flashErrorMessage, 'alert');
+        return new Flash(flashErrorMessage);
       });
     }
   }

lib/api/merge_requests.rb

@@ -302,7 +302,7 @@ module API
         # Examples:
         #   POST /projects/:id/merge_requests/:merge_request_id/approvals
         #
-        post "#{path}/approvals" do
+        post "#{path}/approve" do
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
 
           unauthorized! unless merge_request.can_approve?(current_user)
@@ -314,7 +314,7 @@ module API
           present merge_request, with: Entities::MergeRequestApprovals, current_user: current_user
         end
 
-        delete "#{path}/approvals" do
+        delete "#{path}/unapprove" do
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
 
           not_found! unless merge_request.has_approved?(current_user)

spec/requests/api/merge_requests_spec.rb

@@ -734,11 +734,11 @@ describe API::MergeRequests, api: true  do
     end
   end
 
-  describe 'POST :id/merge_requests/:merge_request_id/approvals' do
+  describe 'POST :id/merge_requests/:merge_request_id/approve' do
     before { project.update_attribute(:approvals_before_merge, 2) }
 
     context 'as the author of the merge request' do
-      before { post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/approvals", user) }
+      before { post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/approve", user) }
 
       it 'returns a 401' do
         expect(response).to have_http_status(401)
@@ -752,7 +752,7 @@ describe API::MergeRequests, api: true  do
         project.team << [approver, :developer]
         project.team << [create(:user), :developer]
 
-        post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/approvals", approver)
+        post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/approve", approver)
       end
 
       it 'approves the merge request' do
@@ -764,7 +764,7 @@ describe API::MergeRequests, api: true  do
     end
   end
 
-  describe 'DELETE :id/merge_requests/:merge_request_id/approvals' do
+  describe 'DELETE :id/merge_requests/:merge_request_id/unapprove' do
     before { project.update_attribute(:approvals_before_merge, 2) }
 
     context 'as a user who has approved the merge request' do
@@ -778,7 +778,7 @@ describe API::MergeRequests, api: true  do
         merge_request.approvals.create(user: approver)
         merge_request.approvals.create(user: unapprover)
 
-        delete api("/projects/#{project.id}/merge_requests/#{merge_request.id}/approvals", unapprover)
+        delete api("/projects/#{project.id}/merge_requests/#{merge_request.id}/unapprove", unapprover)
       end
 
       it 'unapproves the merge request' do
@@ -792,6 +792,7 @@ describe API::MergeRequests, api: true  do
       end
     end
   end
+
   def mr_with_later_created_and_updated_at_time
     merge_request
     merge_request.created_at += 1.hour