diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-21 09:25:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-21 09:25:09 +0000 |
| commit | 1b929586387af4db42fc81253ad310260655f829 (patch) | |
| tree | d7f33c32fd2e1059632599e34a6319e6b1f2e713 /lib/api | |
| parent | 6e1ebcf6e86ca0bd15a623c142ab8bc629817d05 (diff) | |
| parent | 73dff65d8f80df3f1f806c08ed07f085d814eb1a (diff) | |
| download | gitlab-ce-1b929586387af4db42fc81253ad310260655f829.tar.gz | |
Merge branch 'fix-jobs-enabled-parameter' into 'master'
Replace builds_enabled with jobs_enabled in projects API v4
Closes #31012
See merge request !10786
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/projects.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 50842370947..db4b31b55bc 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -11,7 +11,7 @@ module API optional :issues_enabled, type: Boolean, desc: 'Flag indication if the issue tracker is enabled' optional :merge_requests_enabled, type: Boolean, desc: 'Flag indication if merge requests are enabled' optional :wiki_enabled, type: Boolean, desc: 'Flag indication if the wiki is enabled' - optional :builds_enabled, type: Boolean, desc: 'Flag indication if builds are enabled' + optional :jobs_enabled, type: Boolean, desc: 'Flag indication if jobs are enabled' optional :snippets_enabled, type: Boolean, desc: 'Flag indication if snippets are enabled' optional :shared_runners_enabled, type: Boolean, desc: 'Flag indication if shared runners are enabled for that project' optional :container_registry_enabled, type: Boolean, desc: 'Flag indication if the container registry is enabled for that project' @@ -103,6 +103,7 @@ module API end post do attrs = declared_params(include_missing: false) + attrs[:builds_enabled] = attrs.delete(:jobs_enabled) if attrs.has_key?(:jobs_enabled) project = ::Projects::CreateService.new(current_user, attrs).execute if project.saved? @@ -205,7 +206,7 @@ module API # CE at_least_one_of_ce = [ - :builds_enabled, + :jobs_enabled, :container_registry_enabled, :default_branch, :description, @@ -236,6 +237,8 @@ module API authorize! :rename_project, user_project if attrs[:name].present? authorize! :change_visibility_level, user_project if attrs[:visibility].present? + attrs[:builds_enabled] = attrs.delete(:jobs_enabled) if attrs.has_key?(:jobs_enabled) + result = ::Projects::UpdateService.new(user_project, current_user, attrs).execute if result[:status] == :success |