Merge branch 'master' into number_sign_for_external_issue_ref

1 files changed, 43 insertions, 7 deletions

diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 93052fba06b..7e78609ecb9 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -56,7 +56,7 @@ module API
           end
 
         merge_requests = merge_requests.reorder(issuable_order_by => issuable_sort)
-        present paginate(merge_requests), with: Entities::MergeRequest
+        present paginate(merge_requests), with: Entities::MergeRequest, current_user: current_user
       end
 
       # Create MR
@@ -94,7 +94,7 @@ module API
             merge_request.add_labels_by_names(params[:labels].split(","))
           end
 
-          present merge_request, with: Entities::MergeRequest
+          present merge_request, with: Entities::MergeRequest, current_user: current_user
         else
           handle_merge_request_errors! merge_request.errors
         end
@@ -130,7 +130,7 @@ module API
 
           authorize! :read_merge_request, merge_request
 
-          present merge_request, with: Entities::MergeRequest
+          present merge_request, with: Entities::MergeRequest, current_user: current_user
         end
 
         # Show MR commits
@@ -162,7 +162,7 @@ module API
           merge_request = user_project.merge_requests.
             find(params[:merge_request_id])
           authorize! :read_merge_request, merge_request
-          present merge_request, with: Entities::MergeRequestChanges
+          present merge_request, with: Entities::MergeRequestChanges, current_user: current_user
         end
 
         # Update MR
@@ -204,7 +204,7 @@ module API
               merge_request.add_labels_by_names(params[:labels].split(","))
             end
 
-            present merge_request, with: Entities::MergeRequest
+            present merge_request, with: Entities::MergeRequest, current_user: current_user
           else
             handle_merge_request_errors! merge_request.errors
           end
@@ -246,7 +246,7 @@ module API
               execute(merge_request)
           end
 
-          present merge_request, with: Entities::MergeRequest
+          present merge_request, with: Entities::MergeRequest, current_user: current_user
         end
 
         # Cancel Merge if Merge When build succeeds is enabled
@@ -325,7 +325,43 @@ module API
         get "#{path}/closes_issues" do
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
           issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
-          present paginate(issues), with: Entities::Issue
+          present paginate(issues), with: Entities::Issue, current_user: current_user
+        end
+
+        # Subscribes to a merge request
+        #
+        # Parameters:
+        #  id (required)               - The ID of a project
+        #  merge_request_id (required) - The ID of a merge request
+        # Example Request:
+        #   POST /projects/:id/issues/:merge_request_id/subscription
+        post "#{path}/subscription" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          if merge_request.subscribed?(current_user)
+            not_modified!
+          else
+            merge_request.toggle_subscription(current_user)
+            present merge_request, with: Entities::MergeRequest, current_user: current_user
+          end
+        end
+
+        # Unsubscribes from a merge request
+        #
+        # Parameters:
+        #  id (required)               - The ID of a project
+        #  merge_request_id (required) - The ID of a merge request
+        # Example Request:
+        #   DELETE /projects/:id/merge_requests/:merge_request_id/subscription
+        delete "#{path}/subscription" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          if merge_request.subscribed?(current_user)
+            merge_request.unsubscribe(current_user)
+            present merge_request, with: Entities::MergeRequest, current_user: current_user
+          else
+            not_modified!
+          end
         end
       end
     end