diff options
| -rw-r--r-- | config/feature_flags/development/realtime_reviewers.yml | 2 | ||||
| -rw-r--r-- | doc/.vale/gitlab/SubstitutionWarning.yml | 1 | ||||
| -rw-r--r-- | doc/.vale/gitlab/Wordy.yml | 9 | ||||
| -rw-r--r-- | doc/user/project/import/github.md | 22 | ||||
| -rw-r--r-- | lib/gitlab/database/load_balancing/service_discovery/sampler.rb | 2 |
5 files changed, 19 insertions, 17 deletions
diff --git a/config/feature_flags/development/realtime_reviewers.yml b/config/feature_flags/development/realtime_reviewers.yml index 852b76f8904..a7da47a3c29 100644 --- a/config/feature_flags/development/realtime_reviewers.yml +++ b/config/feature_flags/development/realtime_reviewers.yml @@ -5,4 +5,4 @@ rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/378299' milestone: '15.5' type: development group: group::code review -default_enabled: false +default_enabled: true diff --git a/doc/.vale/gitlab/SubstitutionWarning.yml b/doc/.vale/gitlab/SubstitutionWarning.yml index e5f97f5424f..8d6c18c1520 100644 --- a/doc/.vale/gitlab/SubstitutionWarning.yml +++ b/doc/.vale/gitlab/SubstitutionWarning.yml @@ -23,7 +23,6 @@ swap: filesystem: "file system" GFM: "'GitLab Flavored Markdown' or 'GitHub Flavored Markdown'" info: "information" - in order to: "to" n/a: "not applicable" repo: "repository" timezone: "time zone" diff --git a/doc/.vale/gitlab/Wordy.yml b/doc/.vale/gitlab/Wordy.yml index 16434a3a013..45546435ee9 100644 --- a/doc/.vale/gitlab/Wordy.yml +++ b/doc/.vale/gitlab/Wordy.yml @@ -10,7 +10,8 @@ link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list. level: suggestion ignorecase: true swap: - note that: "Be more concise, and rewrite the sentence to not use 'note that'." - please: "Remove the word 'please' from the sentence." - respectively: "Be more precise, and rewrite the sentence to not use 'respectively'." - and so on: "Be more specific, and rewrite the sentence to not use 'and so on'." + note that: "Remove the phrase 'note that'." + please: "Use 'please' only if we've inconvenienced the user." + respectively: "Remove 'respectively' and list each option instead." + and so on: "Remove 'and so on'. Try to use 'like' and provide examples instead." + in order to: "Remove 'in order' and leave 'to'." diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index 3280b1da726..c0b13c76322 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -202,19 +202,21 @@ The following items of a project are imported: - Merge Request description. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18052) in GitLab 15.5. All attachment imports are disabled by default behind - `github_importer_attachments_import` [feature flag](../../../administration/feature_flags.md). From GitLab 15.5, can be imported - [as an additional item](#select-additional-items-to-import). The feature flag was removed. + `github_importer_attachments_import` [feature flag](../../../administration/feature_flags.md). From GitLab 15.5, can + be imported [as an additional item](#select-additional-items-to-import). The feature flag was removed. - Pull request review comments. - Regular issue and pull request comments. - [Git Large File Storage (LFS) Objects](../../../topics/git/lfs/index.md). -- Pull request reviews (GitLab.com and GitLab 13.7 and later). -- Pull request assigned reviewers [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355137) in GitLab 15.6. -- Pull request "merged by" information (GitLab.com and GitLab 13.7 and later). -- Pull request comments replies in discussions ([GitLab.com and GitLab 14.5 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/336596)). -- Diff Notes suggestions ([GitLab.com and GitLab 14.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/340624)). -- Issue events and pull requests events. [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7673) in GitLab 15.4 with `github_importer_issue_events_import` - [feature flag](../../../administration/feature_flags.md) disabled by default. - From GitLab 15.5, can be imported [as an additional item](#select-additional-items-to-import). The feature flag was removed. +- Pull request reviews. +- Pull request assigned reviewers. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355137) in GitLab 15.6. +- Pull request "merged by" information. +- Pull request comments replies in discussions. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336596) in + GitLab 14.5. +- Diff Notes suggestions. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/340624) in GitLab 14.7. +- Issue events and pull requests events. [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7673) in GitLab 15.4 + with `github_importer_issue_events_import` [feature flag](../../../administration/feature_flags.md) disabled by default. + From GitLab 15.5, can be imported [as an additional item](#select-additional-items-to-import). The feature flag was + removed. References to pull requests and issues are preserved. Each imported repository maintains visibility level unless that [visibility level is restricted](../../public_access.md#restrict-use-of-public-or-internal-projects), in which case it diff --git a/lib/gitlab/database/load_balancing/service_discovery/sampler.rb b/lib/gitlab/database/load_balancing/service_discovery/sampler.rb index f8eba2e105d..71870214156 100644 --- a/lib/gitlab/database/load_balancing/service_discovery/sampler.rb +++ b/lib/gitlab/database/load_balancing/service_discovery/sampler.rb @@ -5,7 +5,7 @@ module Gitlab module LoadBalancing class ServiceDiscovery class Sampler - def initialize(max_replica_pools:, seed: rand) + def initialize(max_replica_pools:, seed: Random.new_seed) # seed must be set once and consistent # for every invocation of #sample on # the same instance of Sampler |