diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 00:10:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 00:10:26 +0300 |
| commit | c0bc55ffe14525ff453a8bfe5a88ee87d3b615f1 (patch) | |
| tree | a8e1dac4f7b45d6a2c397b73e1eba92b8505dd9c /config | |
| parent | a880341a7b3a164ba381620852cc3ea0777f67ad (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml | 8 | ||||
| -rw-r--r-- | config/initializers/0_acts_as_taggable.rb | 4 | ||||
| -rw-r--r-- | config/initializers/gitlab_experiment.rb | 9 |
3 files changed, 13 insertions, 8 deletions
diff --git a/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml b/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml deleted file mode 100644 index 56f5afa9ed0..00000000000 --- a/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_reduce_queries_when_ticking_runner_queue -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55496 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323328 -milestone: '13.10' -type: development -group: group::continuous integration -default_enabled: true diff --git a/config/initializers/0_acts_as_taggable.rb b/config/initializers/0_acts_as_taggable.rb index 9a92b8f2d18..9f66d970ffd 100644 --- a/config/initializers/0_acts_as_taggable.rb +++ b/config/initializers/0_acts_as_taggable.rb @@ -9,3 +9,7 @@ ActsAsTaggableOn.tags_counter = false # validate that counter cache is disabled raise "Counter cache is not disabled" if ActsAsTaggableOn::Tagging.reflections["tag"].options[:counter_cache] + +ActsAsTaggableOn::Tagging.include IgnorableColumns +ActsAsTaggableOn::Tagging.ignore_column :id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' +ActsAsTaggableOn::Tagging.ignore_column :taggable_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' diff --git a/config/initializers/gitlab_experiment.rb b/config/initializers/gitlab_experiment.rb index a312755f300..055979bb66b 100644 --- a/config/initializers/gitlab_experiment.rb +++ b/config/initializers/gitlab_experiment.rb @@ -5,4 +5,13 @@ Gitlab::Experiment.configure do |config| config.cache = Gitlab::Experiment::Cache::RedisHashStore.new( pool: ->(&block) { Gitlab::Redis::SharedState.with { |redis| block.call(redis) } } ) + + # TODO: This will be deprecated as of v0.6.0, but needs to stay intact for + # actively running experiments until a versioning concept is put in place to + # enable migrating into the new SHA2 strategy. + config.context_hash_strategy = lambda do |source, seed| + source = source.keys + source.values if source.is_a?(Hash) + data = Array(source).map { |v| (v.respond_to?(:to_global_id) ? v.to_global_id : v).to_s } + Digest::MD5.hexdigest(data.unshift(seed).join('|')) + end end |