Commit eecb6d2f authored by Rémy Coutable's avatar Rémy Coutable

Reduce diff with EE in ProtectedRefsController

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 4a10c813
...@@ -15,6 +15,10 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController ...@@ -15,6 +15,10 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
@protected_ref = @project.protected_branches.find(params[:id]) @protected_ref = @project.protected_branches.find(params[:id])
end end
def access_levels
[:merge_access_levels, :push_access_levels]
end
def protected_ref_params def protected_ref_params
params.require(:protected_branch).permit(:name, params.require(:protected_branch).permit(:name,
merge_access_levels_attributes: access_level_attributes, merge_access_levels_attributes: access_level_attributes,
......
...@@ -32,7 +32,7 @@ class Projects::ProtectedRefsController < Projects::ApplicationController ...@@ -32,7 +32,7 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
@protected_ref = update_service_class.new(@project, current_user, protected_ref_params).execute(@protected_ref) @protected_ref = update_service_class.new(@project, current_user, protected_ref_params).execute(@protected_ref)
if @protected_ref.valid? if @protected_ref.valid?
render json: @protected_ref, status: :ok render json: @protected_ref, status: :ok, include: access_levels
else else
render json: @protected_ref.errors, status: :unprocessable_entity render json: @protected_ref.errors, status: :unprocessable_entity
end end
...@@ -62,6 +62,6 @@ class Projects::ProtectedRefsController < Projects::ApplicationController ...@@ -62,6 +62,6 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
end end
def access_level_attributes def access_level_attributes
%i(access_level id) %i[access_level id]
end end
end end
...@@ -15,6 +15,10 @@ class Projects::ProtectedTagsController < Projects::ProtectedRefsController ...@@ -15,6 +15,10 @@ class Projects::ProtectedTagsController < Projects::ProtectedRefsController
@protected_ref = @project.protected_tags.find(params[:id]) @protected_ref = @project.protected_tags.find(params[:id])
end end
def access_levels
[:create_access_levels]
end
def protected_ref_params def protected_ref_params
params.require(:protected_tag).permit(:name, create_access_levels_attributes: access_level_attributes) params.require(:protected_tag).permit(:name, create_access_levels_attributes: access_level_attributes)
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