Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-17 18:09:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-17 18:09:01 +0300
commitd88ab3545c27cd674f5fb8bff5fb64a9eeed590f (patch)
treec0c6cc7065a765a6c93d67cebbe0dd16431296bd /config
parentf0a387b4a5f08d6739894455664b4d3cb1509cc6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/blame_page_pagination.yml8
-rw-r--r--config/feature_flags/development/updated_mr_header.yml2
-rw-r--r--config/initializers_before_autoloader/004_zeitwerk.rb1
3 files changed, 9 insertions, 2 deletions
diff --git a/config/feature_flags/development/blame_page_pagination.yml b/config/feature_flags/development/blame_page_pagination.yml
new file mode 100644
index 00000000000..49fb1a7f605
--- /dev/null
+++ b/config/feature_flags/development/blame_page_pagination.yml
@@ -0,0 +1,8 @@
+---
+name: blame_page_pagination
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85827
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360927
+milestone: '15.0'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/updated_mr_header.yml b/config/feature_flags/development/updated_mr_header.yml
index b5ed19b65dc..7268076b587 100644
--- a/config/feature_flags/development/updated_mr_header.yml
+++ b/config/feature_flags/development/updated_mr_header.yml
@@ -5,4 +5,4 @@ rollout_issue_url:
milestone: '14.10'
type: development
group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb
index ff96a84166a..db0688d1559 100644
--- a/config/initializers_before_autoloader/004_zeitwerk.rb
+++ b/config/initializers_before_autoloader/004_zeitwerk.rb
@@ -27,7 +27,6 @@ Rails.autoloaders.each do |autoloader|
'dn' => 'DN',
'gitlab_cli_activity_unique_counter' => 'GitLabCliActivityUniqueCounter',
'global_id_type' => 'GlobalIDType',
- 'global_id_compatibility' => 'GlobalIDCompatibility',
'hll' => 'HLL',
'hll_redis_counter' => 'HLLRedisCounter',
'redis_hll_metric' => 'RedisHLLMetric',