diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 18:11:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 18:11:19 +0300 |
| commit | 6cffe9ea21d0974ebd3c544a3b711ffcd35649e2 (patch) | |
| tree | a40fc35d2ef7a1a36a669094bf1d38d5df72265f /config | |
| parent | ec0ecba05cf7712bc8095af9363ee8ff8d999654 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/rubygem_packages.yml | 8 | ||||
| -rw-r--r-- | config/feature_flags/development/user_mode_in_session.yml | 8 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/config/feature_flags/development/rubygem_packages.yml b/config/feature_flags/development/rubygem_packages.yml new file mode 100644 index 00000000000..9f394f091bb --- /dev/null +++ b/config/feature_flags/development/rubygem_packages.yml @@ -0,0 +1,8 @@ +--- +name: rubygem_packages +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52147 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299383 +milestone: '13.9' +type: development +group: group::package +default_enabled: false diff --git a/config/feature_flags/development/user_mode_in_session.yml b/config/feature_flags/development/user_mode_in_session.yml index a3c4d44e4ce..1b0a0053cf4 100644 --- a/config/feature_flags/development/user_mode_in_session.yml +++ b/config/feature_flags/development/user_mode_in_session.yml @@ -1,8 +1,8 @@ --- name: user_mode_in_session -introduced_by_url: -rollout_issue_url: -milestone: +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16981 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321025 +milestone: 12.4 type: development -group: +group: group::access default_enabled: false diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 29b60aa91c5..65627b0e166 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -416,7 +416,7 @@ production: &base ## Gravatar ## If using gravatar.com, there's nothing to change here. For Libravatar ## you'll need to provide the custom URLs. For more information, - ## see: https://docs.gitlab.com/ee/customization/libravatar.html + ## see: https://docs.gitlab.com/ee/administration/libravatar.html gravatar: # Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username} # plain_url: "http://..." # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon @@ -590,7 +590,7 @@ production: &base # enabled: true # primary_api_url: http://localhost:5000/ # internal address to the primary registry, will be used by GitLab to directly communicate with primary registry API - ## Feature Flag https://docs.gitlab.com/ee/user/project/operations/feature_flags.html + ## Feature Flag https://docs.gitlab.com/ee/operations/feature_flags.html feature_flags: unleash: # enabled: false |