diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-03 10:57:46 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-03 10:57:49 +0200 |
| commit | 3e99123095b26988de67a94b0e7a5207c1ef5ae2 (patch) | |
| tree | b82713bd0402f3380dbd5eace20dae62990783e0 /doc/api/projects.md | |
| parent | 7df495fb7702f3635d6746cb9b0d79d00eafed80 (diff) | |
| download | gitlab-ce-3e99123095b26988de67a94b0e7a5207c1ef5ae2.tar.gz | |
Fix merge conflicts - squashed commit
# Conflicts:
# app/models/project.rb
Diffstat (limited to 'doc/api/projects.md')
| -rw-r--r-- | doc/api/projects.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index de1faadebf5..f5f195b97df 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -424,6 +424,7 @@ Parameters: - `builds_enabled` (optional) - `wiki_enabled` (optional) - `snippets_enabled` (optional) +- `container_registry_enabled` (optional) - `public` (optional) - if `true` same as setting visibility_level = 20 - `visibility_level` (optional) - `import_url` (optional) @@ -447,6 +448,7 @@ Parameters: - `builds_enabled` (optional) - `wiki_enabled` (optional) - `snippets_enabled` (optional) +- `container_registry_enabled` (optional) - `public` (optional) - if `true` same as setting visibility_level = 20 - `visibility_level` (optional) - `import_url` (optional) @@ -472,6 +474,7 @@ Parameters: - `builds_enabled` (optional) - `wiki_enabled` (optional) - `snippets_enabled` (optional) +- `container_registry_enabled` (optional) - `public` (optional) - if `true` same as setting visibility_level = 20 - `visibility_level` (optional) - `public_builds` (optional) |