summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/base_service.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-07-24 15:46:40 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-07-24 15:50:12 -0400
commitb9b2d08638131be9861cb8d7e4f645a9013dd03f (patch)
tree0fdd8567ea4b824f986dc3826b1cf972c1a455eb /app/services/merge_requests/base_service.rb
parente496c35fedeb44648dec363acac1e6e30722d1b7 (diff)
downloadgitlab-ce-rs-issue-2092.tar.gz
Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092
Closes #2092
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
-rw-r--r--app/services/merge_requests/base_service.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index e455fe95791..7b306a8a531 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -20,5 +20,11 @@ module MergeRequests
merge_request.project.execute_services(merge_data, :merge_request_hooks)
end
end
+
+ private
+
+ def filter_params
+ super(:merge_request)
+ end
end
end