diff options
| author | winniehell <git@winniehell.de> | 2017-04-20 00:29:09 +0200 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2017-04-20 00:29:09 +0200 |
| commit | de2c2d9cc6c12857285dc7c62d7224f50517e573 (patch) | |
| tree | cdf6eb241dfb0c4282a6fbc145206801d14165ca | |
| parent | db9dd06627ba59300e923987a1a23f9a0a81f138 (diff) | |
| download | gitlab-ce-de2c2d9cc6c12857285dc7c62d7224f50517e573.tar.gz | |
Replace builds_enabled with jobs_enabled in projects API v4 (!10786)
| -rw-r--r-- | changelogs/unreleased/fix-jobs-enabled-parameter.yml | 4 | ||||
| -rw-r--r-- | lib/api/projects.rb | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changelogs/unreleased/fix-jobs-enabled-parameter.yml b/changelogs/unreleased/fix-jobs-enabled-parameter.yml new file mode 100644 index 00000000000..5f73b66837f --- /dev/null +++ b/changelogs/unreleased/fix-jobs-enabled-parameter.yml @@ -0,0 +1,4 @@ +--- +title: Replace builds_enabled with jobs_enabled in projects API v4 +merge_request: 10786 +author: winniehell 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 |