diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 15:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 15:08:52 +0300 |
commit | 9f5ac379c76c278ee9ee1662e26c4612b0a117bd (patch) | |
tree | 49cd59544c083678fefd1e77340ca5e2b6e3565c /config | |
parent | 7240fb1a06c9e1b254719426b1ac96ec2f00fe35 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 22 insertions, 8 deletions
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_marked_as_draft.yml b/config/feature_flags/development/usage_data_i_code_review_user_marked_as_draft.yml new file mode 100644 index 00000000000..82dc1582558 --- /dev/null +++ b/config/feature_flags/development/usage_data_i_code_review_user_marked_as_draft.yml @@ -0,0 +1,8 @@ +--- +name: usage_data_i_code_review_user_marked_as_draft +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301223 +rollout_issue_url: +milestone: '13.9' +type: development +group: group::code review +default_enabled: true diff --git a/config/feature_flags/development/usage_data_i_code_review_user_unmarked_as_draft.yml b/config/feature_flags/development/usage_data_i_code_review_user_unmarked_as_draft.yml new file mode 100644 index 00000000000..9582562ff74 --- /dev/null +++ b/config/feature_flags/development/usage_data_i_code_review_user_unmarked_as_draft.yml @@ -0,0 +1,8 @@ +--- +name: usage_data_i_code_review_user_unmarked_as_draft +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301223 +rollout_issue_url: +milestone: '13.9' +type: development +group: group::code review +default_enabled: true diff --git a/config/feature_flags/development/vue_project_members_list.yml b/config/feature_flags/development/vue_project_members_list.yml index 37eb9167ddd..55f4d2bf62a 100644 --- a/config/feature_flags/development/vue_project_members_list.yml +++ b/config/feature_flags/development/vue_project_members_list.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299954 milestone: '13.9' type: development group: group::access -default_enabled: false +default_enabled: true diff --git a/config/initializers/validate_puma.rb b/config/initializers/validate_puma.rb index bce9ddb9a66..c4516914018 100644 --- a/config/initializers/validate_puma.rb +++ b/config/initializers/validate_puma.rb @@ -1,13 +1,11 @@ # frozen_string_literal: true -def allow_single_mode? - return false if Gitlab.com? - - Gitlab::Utils.to_boolean(ENV['PUMA_SKIP_CLUSTER_VALIDATION']) +def max_puma_workers + Puma.cli_config.options[:workers].to_i end -if Gitlab::Runtime.puma? && ::Puma.cli_config.options[:workers].to_i == 0 - return if allow_single_mode? +if Gitlab::Runtime.puma? && max_puma_workers == 0 + raise 'Puma is only supported in Clustered mode (workers > 0)' if Gitlab.com? - raise 'Puma is only supported in Cluster-mode: workers > 0' + warn 'WARNING: Puma is running in Single mode (workers = 0). Some features may not work. Please refer to https://gitlab.com/groups/gitlab-org/-/epics/5303 for info.' end |