Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 78 deletions

diff --git a/config/README.md b/config/README.md
index be5bd442fd8..7f3125cefd2 100644
--- a/config/README.md
+++ b/config/README.md
@@ -147,34 +147,3 @@ searched):
 3. the configuration file pointed to by the
 `GITLAB_REDIS_CONFIG_FILE` environment variable
 4. the configuration file `resque.yml`
-
-## redis.trace_chunks.yml
-
-If configured, `redis.trace_chunks.yml` overrides the
-`resque.yml` settings to configure the Redis database instance
-used for clients of `::Gitlab::Redis::TraceChunks` which stores CI trace chunks.
-
-Settings here can be overridden by the environment variable
-`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` which provides
-an alternate location for configuration settings.
-
-The order of precedence for the URL used to connect to the Redis instance
-used for `trace_chunks` is:
-1. URL from a configuration file pointed to by the
-`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` environment variable
-2. URL from `redis.trace_chunks.yml`
-3. URL from a configuration file pointed to by the
-`GITLAB_REDIS_CONFIG_FILE` environment variable
-4. URL from `resque.yml`
-5. `redis://localhost:6383`
-
-The order of precedence for all other configuration settings for `trace_chunks`
-are selected from only the first of the following files found (if a setting
-is not provided in an earlier file, the remainder of the files are not
-searched):
-1. the configuration file pointed to by the
-`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` environment variable
-2. the configuration file `redis.trace_chunks.yml`
-3. the configuration file pointed to by the
-`GITLAB_REDIS_CONFIG_FILE` environment variable
-4. the configuration file `resque.yml`
diff --git a/config/feature_flags/development/usage_data_track_ecosystem_jira_service.yml b/config/feature_flags/development/usage_data_track_ecosystem_jira_service.yml
deleted file mode 100644
index adf850aa8bc..00000000000
--- a/config/feature_flags/development/usage_data_track_ecosystem_jira_service.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_track_ecosystem_jira_service
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52110
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300447
-milestone: '13.9'
-type: development
-group: group::ecosystem
-default_enabled: false
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index fe37dfd7579..a6025a6dbf0 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -8,4 +8,3 @@
 Gitlab::Redis::Cache.with { nil }
 Gitlab::Redis::Queues.with { nil }
 Gitlab::Redis::SharedState.with { nil }
-Gitlab::Redis::TraceChunks.with { nil }
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
new file mode 100644
index 00000000000..be4f01f537d
--- /dev/null
+++ b/config/initializers/flipper.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Rails.application.configure do
+  config.flipper.preload = false
+  config.flipper.memoizer = false
+end
diff --git a/config/redis.trace_chunks.yml.example b/config/redis.trace_chunks.yml.example
deleted file mode 100644
index d38b9ba4966..00000000000
--- a/config/redis.trace_chunks.yml.example
+++ /dev/null
@@ -1,38 +0,0 @@
-# If you change this file in a merge request, please also create
-# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
-#
-development:
-  url: redis://localhost:6379/13
-  #
-  # url: redis://localhost:6382
-  # sentinels:
-  #   -
-  #     host: localhost
-  #     port: 26382 # point to sentinel, not to redis port
-  #   -
-  #     host: replica2
-  #     port: 26382 # point to sentinel, not to redis port
-test:
-  url: redis://localhost:6379/13
-  #
-  # url: redis://localhost:6382
-production:
-  # Redis (single instance)
-  url: unix:/var/run/redis/redis.trace_chunks.sock
-  ##
-  # Redis + Sentinel (for HA)
-  #
-  # Please read instructions carefully before using it as you may lose data:
-  # http://redis.io/topics/sentinel
-  #
-  # You must specify a list of a few sentinels that will handle client connection
-  # please read here for more information: https://docs.gitlab.com/ee/administration/redis/index.html
-  ##
-  # url: redis://master:6382
-  # sentinels:
-  #   -
-  #     host: replica1
-  #     port: 26382 # point to sentinel, not to redis port
-  #   -
-  #     host: replica2
-  #     port: 26382 # point to sentinel, not to redis port