Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 6 deletions

diff --git a/app/models/ci/build_trace_chunks/redis.rb b/app/models/ci/build_trace_chunks/redis.rb
index 58d50b39c11..003ec107895 100644
--- a/app/models/ci/build_trace_chunks/redis.rb
+++ b/app/models/ci/build_trace_chunks/redis.rb
@@ -4,7 +4,7 @@ module Ci
   module BuildTraceChunks
     class Redis
       CHUNK_REDIS_TTL = 1.week
-      LUA_APPEND_CHUNK = <<~EOS.freeze
+      LUA_APPEND_CHUNK = <<~EOS
         local key, new_data, offset = KEYS[1], ARGV[1], ARGV[2]
         local length = new_data:len()
         local expire = #{CHUNK_REDIS_TTL.seconds}
diff --git a/app/models/concerns/counter_attribute.rb b/app/models/concerns/counter_attribute.rb
index b468415c4c7..829b2a6ef21 100644
--- a/app/models/concerns/counter_attribute.rb
+++ b/app/models/concerns/counter_attribute.rb
@@ -33,7 +33,7 @@ module CounterAttribute
   extend AfterCommitQueue
   include Gitlab::ExclusiveLeaseHelpers
 
-  LUA_STEAL_INCREMENT_SCRIPT = <<~EOS.freeze
+  LUA_STEAL_INCREMENT_SCRIPT = <<~EOS
     local increment_key, flushed_key = KEYS[1], KEYS[2]
     local increment_value = redis.call("get", increment_key) or 0
     local flushed_value = redis.call("incrby", flushed_key, increment_value)
diff --git a/app/models/design_management/repository.rb b/app/models/design_management/repository.rb
index 985d6317d5d..2b1e6070e6b 100644
--- a/app/models/design_management/repository.rb
+++ b/app/models/design_management/repository.rb
@@ -8,7 +8,7 @@ module DesignManagement
     # repository is entirely GitLab-managed rather than user-facing.
     #
     # Enable all uploaded files to be stored in LFS.
-    MANAGED_GIT_ATTRIBUTES = <<~GA.freeze
+    MANAGED_GIT_ATTRIBUTES = <<~GA
       /#{DesignManagement.designs_directory}/* filter=lfs diff=lfs merge=lfs -text
     GA
 
diff --git a/app/models/packages/dependency.rb b/app/models/packages/dependency.rb
index a32c3c05bb3..ad3944b5f21 100644
--- a/app/models/packages/dependency.rb
+++ b/app/models/packages/dependency.rb
@@ -7,8 +7,8 @@ class Packages::Dependency < ApplicationRecord
   validates :name, uniqueness: { scope: :version_pattern }
 
   NAME_VERSION_PATTERN_TUPLE_MATCHING = '(name, version_pattern) = (?, ?)'
-  MAX_STRING_LENGTH = 255.freeze
-  MAX_CHUNKED_QUERIES_COUNT = 10.freeze
+  MAX_STRING_LENGTH = 255
+  MAX_CHUNKED_QUERIES_COUNT = 10
 
   def self.ids_for_package_names_and_version_patterns(names_and_version_patterns = {}, chunk_size = 50, max_rows_limit = 200)
     names_and_version_patterns.reject! { |key, value| key.size > MAX_STRING_LENGTH || value.size > MAX_STRING_LENGTH }
diff --git a/app/models/packages/tag.rb b/app/models/packages/tag.rb
index 771d016daed..14a1ae98ed4 100644
--- a/app/models/packages/tag.rb
+++ b/app/models/packages/tag.rb
@@ -4,7 +4,7 @@ class Packages::Tag < ApplicationRecord
 
   validates :package, :name, presence: true
 
-  FOR_PACKAGES_TAGS_LIMIT = 200.freeze
+  FOR_PACKAGES_TAGS_LIMIT = 200
   NUGET_TAGS_SEPARATOR = ' ' # https://docs.microsoft.com/en-us/nuget/reference/nuspec#tags
 
   scope :preload_package, -> { preload(:package) }