Commit ac67e9f3 authored by Mark Chao's avatar Mark Chao

Refactor API endpoints

parent 77b2ef8e
...@@ -83,7 +83,6 @@ module API ...@@ -83,7 +83,6 @@ module API
authorize! :admin_project, user_project authorize! :admin_project, user_project
params = declared_params(include_missing: false) params = declared_params(include_missing: false)
puts params.inspect
approval_rule = user_project.approval_rules.find(params.delete(:approval_rule_id)) approval_rule = user_project.approval_rules.find(params.delete(:approval_rule_id))
result = ::ApprovalRules::UpdateService.new(approval_rule, current_user, params).execute result = ::ApprovalRules::UpdateService.new(approval_rule, current_user, params).execute
......
...@@ -148,7 +148,7 @@ describe MergeRequests::RefreshService do ...@@ -148,7 +148,7 @@ describe MergeRequests::RefreshService do
end end
[forked_merge_request].each do |merge_request| [forked_merge_request].each do |merge_request|
expect(::Gitlab::CodeOwners).not_to receive(:for_merge_request) expect(::Gitlab::CodeOwners).not_to receive(:for_merge_request).with(merge_request)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment