diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 21:12:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 21:12:20 +0300 |
| commit | 60aef5496ecea447e860786fe391eb45d2cf61e5 (patch) | |
| tree | a20fdcc01a8d384e8b6d9c9cc6f58ad3177070d7 /config | |
| parent | 76cbe9e688549d47b0055573380b908cf9a72ed1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/dependency_proxy_manifest_workhorse.yml | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml b/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml index 5ff6fc93e0a..f1e3be78da8 100644 --- a/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml +++ b/config/feature_flags/development/dependency_proxy_manifest_workhorse.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344216 milestone: '14.4' type: development group: group::package -default_enabled: false +default_enabled: true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index bb69c215f8d..4e5e15d261b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1024,6 +1024,9 @@ production: &base # - { name: 'bitbucket', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET' } + # - { name: 'dingtalk', + # app_id: 'YOUR_APP_ID', + # app_secret: 'YOUR_APP_SECRET' } # - { name: 'gitlab', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET', @@ -1515,6 +1518,9 @@ test: - { name: 'bitbucket', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET' } + - { name: 'dingtalk', + app_id: 'YOUR_APP_ID', + app_secret: 'YOUR_APP_SECRET' } - { name: 'gitlab', app_id: 'YOUR_APP_ID', app_secret: 'YOUR_APP_SECRET', |