From 30e5b31eea5f1cab88db57aa681bcbf21f115741 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Mon, 8 Jul 2019 20:06:24 -0500 Subject: [PATCH] Add frozen_string_literal to EE files now in CE --- config/initializers/0_license.rb | 2 ++ config/initializers/elastic_client_setup.rb | 2 ++ config/initializers/geo.rb | 2 ++ config/initializers/load_balancing.rb | 2 ++ config/initializers/sidekiq_cluster.rb | 2 ++ 5 files changed, 10 insertions(+) diff --git a/config/initializers/0_license.rb b/config/initializers/0_license.rb index 0d101517c79..f750022dfdf 100644 --- a/config/initializers/0_license.rb +++ b/config/initializers/0_license.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Gitlab.ee do begin public_key_file = File.read(Rails.root.join(".license_encryption_key.pub")) diff --git a/config/initializers/elastic_client_setup.rb b/config/initializers/elastic_client_setup.rb index 0f6d494ba3c..2ecb7956007 100644 --- a/config/initializers/elastic_client_setup.rb +++ b/config/initializers/elastic_client_setup.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Be sure to restart your server when you modify this file. require 'gitlab/current_settings' diff --git a/config/initializers/geo.rb b/config/initializers/geo.rb index b820f629d92..4cc9fbf49b2 100644 --- a/config/initializers/geo.rb +++ b/config/initializers/geo.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Gitlab.ee do if File.exist?(Rails.root.join('config/database_geo.yml')) Rails.application.configure do diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb index 1ac422a6e8a..029c0ff4277 100644 --- a/config/initializers/load_balancing.rb +++ b/config/initializers/load_balancing.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # We need to run this initializer after migrations are done so it doesn't fail on CI Gitlab.ee do diff --git a/config/initializers/sidekiq_cluster.rb b/config/initializers/sidekiq_cluster.rb index cbf8caef706..baa7495aa29 100644 --- a/config/initializers/sidekiq_cluster.rb +++ b/config/initializers/sidekiq_cluster.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV['ENABLE_SIDEKIQ_CLUSTER'] && Gitlab.ee? Thread.new do Thread.current.abort_on_exception = true