diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 21:17:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 21:17:07 +0300 |
| commit | 6ce6d20cf0b81275bad7bf8e95cf49bd475c5c4f (patch) | |
| tree | ba258f58856f457f94daf4b3dbf85045f4e07acc /config | |
| parent | c1a7bcdf1bfef9455bc58b1737f52530bf681a90 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/openai_experimentation.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/pipeline_name_in_api.yml (renamed from config/feature_flags/development/retry_job_start_pipeline_after_commit.yml) | 8 | ||||
| -rw-r--r-- | config/feature_flags/development/summarize_comments.yml | 8 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/config/feature_flags/development/openai_experimentation.yml b/config/feature_flags/development/openai_experimentation.yml index b3585038c07..8f0bb6df036 100644 --- a/config/feature_flags/development/openai_experimentation.yml +++ b/config/feature_flags/development/openai_experimentation.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116364 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403855 milestone: '15.11' type: development -group: group::ai_enablement +group: group::ai-enablement default_enabled: false diff --git a/config/feature_flags/development/retry_job_start_pipeline_after_commit.yml b/config/feature_flags/development/pipeline_name_in_api.yml index dce73e16119..cb22fca2932 100644 --- a/config/feature_flags/development/retry_job_start_pipeline_after_commit.yml +++ b/config/feature_flags/development/pipeline_name_in_api.yml @@ -1,8 +1,8 @@ --- -name: retry_job_start_pipeline_after_commit -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116480 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403934 +name: pipeline_name_in_api +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398131 milestone: '15.11' type: development -group: group::pipeline execution +group: group::delivery default_enabled: false diff --git a/config/feature_flags/development/summarize_comments.yml b/config/feature_flags/development/summarize_comments.yml new file mode 100644 index 00000000000..e0f8b223895 --- /dev/null +++ b/config/feature_flags/development/summarize_comments.yml @@ -0,0 +1,8 @@ +--- +name: summarize_comments +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117296 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406758 +milestone: '15.11' +type: development +group: group::ai-enablement +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index d380a721a4c..e4b1162a21d 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -297,6 +297,8 @@ - 1 - - ldap_group_sync - 2 +- - llm_completion + - 1 - - mail_scheduler - 2 - - mailers |