Commit 9197028c authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Re-add removed params from V3 project API

parent 6c48d4ec
...@@ -25,6 +25,10 @@ module API ...@@ -25,6 +25,10 @@ module API
optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access' optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access'
optional :only_allow_merge_if_build_succeeds, type: Boolean, desc: 'Only allow to merge if builds succeed' optional :only_allow_merge_if_build_succeeds, type: Boolean, desc: 'Only allow to merge if builds succeed'
optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved' optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved'
# EE-specific
optional :repository_storage, type: String, desc: 'Which storage shard the repository is on. Available only to admins'
optional :approvals_before_merge, type: Integer, desc: 'How many approvers should approve merge request by default'
end end
def map_public_to_visibility_level(attrs) def map_public_to_visibility_level(attrs)
...@@ -287,7 +291,9 @@ module API ...@@ -287,7 +291,9 @@ module API
:lfs_enabled, :public, :visibility_level, :public_builds, :lfs_enabled, :public, :visibility_level, :public_builds,
:request_access_enabled, :only_allow_merge_if_build_succeeds, :request_access_enabled, :only_allow_merge_if_build_succeeds,
:only_allow_merge_if_all_discussions_are_resolved, :path, :only_allow_merge_if_all_discussions_are_resolved, :path,
:default_branch :default_branch,
## EE-specific
:repository_storage, :approvals_before_merge
end end
put ':id' do put ':id' do
authorize_admin_project authorize_admin_project
......
...@@ -1195,6 +1195,15 @@ describe API::V3::Projects, api: true do ...@@ -1195,6 +1195,15 @@ describe API::V3::Projects, api: true do
expect(json_response['request_access_enabled']).to eq(false) expect(json_response['request_access_enabled']).to eq(false)
end end
it 'updates approvals_before_merge' do
project_param = { approvals_before_merge: 3 }
put v3_api("/projects/#{project.id}", user), project_param
expect(response).to have_http_status(200)
expect(json_response['approvals_before_merge']).to eq(3)
end
it 'updates path & name to existing path & name in different namespace' do it 'updates path & name to existing path & name in different namespace' do
project_param = { path: project4.path, name: project4.name } project_param = { path: project4.path, name: project4.name }
put v3_api("/projects/#{project3.id}", user), project_param put v3_api("/projects/#{project3.id}", user), project_param
......
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