diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-23 23:08:00 +0300 |
commit | aa2a7dad59c0db8b15aadbb58a861237a36c95ee (patch) | |
tree | d55ab82ba5c5195b003f9b29c2c17646fffbdae6 /lib/api/merge_requests.rb | |
parent | b99471ca5de6e867c44ea21bf85252cd174ccec7 (diff) | |
parent | c002a560afae7db6a5c778bc78028243c2fc945a (diff) | |
download | gitlab-ce-aa2a7dad59c0db8b15aadbb58a861237a36c95ee.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
# app/assets/stylesheets/pages/issuable.scss
Diffstat (limited to 'lib/api/merge_requests.rb')
-rw-r--r-- | lib/api/merge_requests.rb | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 7e78609ecb9..4e7de8867b4 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -327,42 +327,6 @@ module API issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user)) 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 end |