summaryrefslogtreecommitdiff
path: root/lib/api/subscriptions.rb
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-05-12 18:05:50 +0000
committerClement Ho <ClemMakesApps@gmail.com>2017-05-16 11:08:52 -0500
commitc316ce2525ab97c55a635bd513fc45f0de53eba3 (patch)
tree283c4cd3fe5b8ec12a8b646197090bb550f3a441 /lib/api/subscriptions.rb
parent2c5e70bec63aa707e5c91b9a7fadbb42de41e983 (diff)
parentec1a3c093f7a8d2fe29e46ec06e6b35e3f1d97ff (diff)
downloadgitlab-ce-c316ce2525ab97c55a635bd513fc45f0de53eba3.tar.gz
Merge branch 'master' into '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled'
Diffstat (limited to 'lib/api/subscriptions.rb')
-rw-r--r--lib/api/subscriptions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/subscriptions.rb b/lib/api/subscriptions.rb
index dbe54d3cd31..91567909998 100644
--- a/lib/api/subscriptions.rb
+++ b/lib/api/subscriptions.rb
@@ -5,7 +5,7 @@ module API
subscribable_types = {
'merge_requests' => proc { |id| find_merge_request_with_access(id, :update_merge_request) },
'issues' => proc { |id| find_project_issue(id) },
- 'labels' => proc { |id| find_project_label(id) },
+ 'labels' => proc { |id| find_project_label(id) }
}
params do