Reduce diff with EE in ProtectedRefsController
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
4a10c813e7
commit
eecb6d2f78
|
@ -15,6 +15,10 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
|
|||
@protected_ref = @project.protected_branches.find(params[:id])
|
||||
end
|
||||
|
||||
def access_levels
|
||||
[:merge_access_levels, :push_access_levels]
|
||||
end
|
||||
|
||||
def protected_ref_params
|
||||
params.require(:protected_branch).permit(:name,
|
||||
merge_access_levels_attributes: access_level_attributes,
|
||||
|
|
|
@ -32,7 +32,7 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
|
|||
@protected_ref = update_service_class.new(@project, current_user, protected_ref_params).execute(@protected_ref)
|
||||
|
||||
if @protected_ref.valid?
|
||||
render json: @protected_ref, status: :ok
|
||||
render json: @protected_ref, status: :ok, include: access_levels
|
||||
else
|
||||
render json: @protected_ref.errors, status: :unprocessable_entity
|
||||
end
|
||||
|
@ -62,6 +62,6 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def access_level_attributes
|
||||
%i(access_level id)
|
||||
%i[access_level id]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,6 +15,10 @@ class Projects::ProtectedTagsController < Projects::ProtectedRefsController
|
|||
@protected_ref = @project.protected_tags.find(params[:id])
|
||||
end
|
||||
|
||||
def access_levels
|
||||
[:create_access_levels]
|
||||
end
|
||||
|
||||
def protected_ref_params
|
||||
params.require(:protected_tag).permit(:name, create_access_levels_attributes: access_level_attributes)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue