Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ac67e9f3
Commit
ac67e9f3
authored
Feb 01, 2019
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor API endpoints
parent
77b2ef8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
ee/lib/api/project_approval_rules.rb
ee/lib/api/project_approval_rules.rb
+0
-1
ee/spec/services/ee/merge_requests/refresh_service_spec.rb
ee/spec/services/ee/merge_requests/refresh_service_spec.rb
+1
-1
No files found.
ee/lib/api/project_approval_rules.rb
View file @
ac67e9f3
...
@@ -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
...
...
ee/spec/services/ee/merge_requests/refresh_service_spec.rb
View file @
ac67e9f3
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment