diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-21 15:57:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-21 15:57:43 +0000 |
| commit | ca297d7a6f098a9ab5e9ee4b9937c15b8c973e94 (patch) | |
| tree | 267f91fa9a8ad3eda2521bdd689193a436a47294 | |
| parent | 7732542c9205cc3ba08474ac58b7c3a18bfebdc1 (diff) | |
| parent | 8bdfd8aa8789bb44c852398dd13866fc1ab44d29 (diff) | |
| download | gitlab-ce-ca297d7a6f098a9ab5e9ee4b9937c15b8c973e94.tar.gz | |
Merge branch '42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified' into 'master'
Resolve "API: PUT /projects/:id fails when only ci_config_path is specified"
Closes #42509
See merge request gitlab-org/gitlab-ce!17105
| -rw-r--r-- | changelogs/unreleased/42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified.yml | 5 | ||||
| -rw-r--r-- | lib/api/projects.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified.yml b/changelogs/unreleased/42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified.yml new file mode 100644 index 00000000000..a3dc1917001 --- /dev/null +++ b/changelogs/unreleased/42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified.yml @@ -0,0 +1,5 @@ +--- +title: Allow to call PUT /projects/:id API with only ci_config_path specified +merge_request: 17105 +author: Laszlo Karpati +type: fixed diff --git a/lib/api/projects.rb b/lib/api/projects.rb index e90892a90f7..b552b0e0c5d 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -271,6 +271,7 @@ module API [ :jobs_enabled, :resolve_outdated_diff_discussions, + :ci_config_path, :container_registry_enabled, :default_branch, :description, |