Add latest changes from gitlab-org/gitlab@master

8 files changed, 9 insertions, 13 deletions

diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index 80278e07e65..269145309fc 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -19,7 +19,7 @@ module Avatarable
   module ShadowMethods
     def avatar_url(**args)
       # We use avatar_path instead of overriding avatar_url because of carrierwave.
-      # See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11001/diffs#note_28659864
+      # See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/11001/diffs#note_28659864
 
       avatar_path(only_path: args.fetch(:only_path, true), size: args[:size]) || super
     end
diff --git a/app/models/concerns/group_descendant.rb b/app/models/concerns/group_descendant.rb
index ed14b73ac1b..7e6a20c27e8 100644
--- a/app/models/concerns/group_descendant.rb
+++ b/app/models/concerns/group_descendant.rb
@@ -50,7 +50,7 @@ module GroupDescendant
         child: child.inspect,
         preloaded: preloaded.map(&:full_path)
       }
-      issue_url = 'https://gitlab.com/gitlab-org/gitlab-ce/issues/49404'
+      issue_url = 'https://gitlab.com/gitlab-org/gitlab-foss/issues/49404'
 
       Gitlab::Sentry.track_exception(exception, issue_url: issue_url, extra: extras)
     end
diff --git a/app/models/concerns/issuable_states.rb b/app/models/concerns/issuable_states.rb
index b722c541580..33bc41d7f44 100644
--- a/app/models/concerns/issuable_states.rb
+++ b/app/models/concerns/issuable_states.rb
@@ -6,7 +6,7 @@ module IssuableStates
   # The state:string column is being migrated to state_id:integer column
   # This is a temporary hook to populate state_id column with new values
   # and should be removed after the state column is removed.
-  # Check https://gitlab.com/gitlab-org/gitlab-ce/issues/51789 for more information
+  # Check https://gitlab.com/gitlab-org/gitlab-foss/issues/51789 for more information
   included do
     before_save :set_state_id
   end
diff --git a/app/models/concerns/label_eventable.rb b/app/models/concerns/label_eventable.rb
index d22d93448e4..aad7259f2ad 100644
--- a/app/models/concerns/label_eventable.rb
+++ b/app/models/concerns/label_eventable.rb
@@ -5,7 +5,7 @@
 # Contains functionality related to objects that support adding/removing labels.
 #
 # This concern is not used yet, it will be used for:
-# https://gitlab.com/gitlab-org/gitlab-ce/issues/48483
+# https://gitlab.com/gitlab-org/gitlab-foss/issues/48483
 
 module LabelEventable
   extend ActiveSupport::Concern
diff --git a/app/models/concerns/reactive_caching.rb b/app/models/concerns/reactive_caching.rb
index d91be73d6f0..f9a52cd54bd 100644
--- a/app/models/concerns/reactive_caching.rb
+++ b/app/models/concerns/reactive_caching.rb
@@ -173,11 +173,7 @@ module ReactiveCaching
     end
 
     def within_reactive_cache_lifetime?(*args)
-      if Feature.enabled?(:reactive_caching_check_key_exists, default_enabled: true)
-        Rails.cache.exist?(alive_reactive_cache_key(*args))
-      else
-        !!Rails.cache.read(alive_reactive_cache_key(*args))
-      end
+      Rails.cache.exist?(alive_reactive_cache_key(*args))
     end
 
     def enqueuing_update(*args)
diff --git a/app/models/concerns/relative_positioning.rb b/app/models/concerns/relative_positioning.rb
index 6d3c7a7ed68..dfe3c391880 100644
--- a/app/models/concerns/relative_positioning.rb
+++ b/app/models/concerns/relative_positioning.rb
@@ -225,7 +225,7 @@ module RelativePositioning
   def calculate_relative_position(calculation)
     # When calculating across projects, this is much more efficient than
     # MAX(relative_position) without the GROUP BY, due to index usage:
-    # https://gitlab.com/gitlab-org/gitlab-ce/issues/54276#note_119340977
+    # https://gitlab.com/gitlab-org/gitlab-foss/issues/54276#note_119340977
     relation = scoped_items
                  .order(Gitlab::Database.nulls_last_order('position', 'DESC'))
                  .group(self.class.relative_positioning_parent_column)
diff --git a/app/models/concerns/routable.rb b/app/models/concerns/routable.rb
index 57118bf7a6b..bdd87437e2a 100644
--- a/app/models/concerns/routable.rb
+++ b/app/models/concerns/routable.rb
@@ -29,7 +29,7 @@ module Routable
     #
     # Usage:
     #
-    #     Klass.find_by_full_path('gitlab-org/gitlab-ce')
+    #     Klass.find_by_full_path('gitlab-org/gitlab-foss')
     #
     # Returns a single object, or nil.
     def find_by_full_path(path, follow_redirects: false)
@@ -48,7 +48,7 @@ module Routable
     #
     # Usage:
     #
-    #     Klass.where_full_path_in(%w{gitlab-org/gitlab-ce gitlab-org/gitlab-ee})
+    #     Klass.where_full_path_in(%w{gitlab-org/gitlab-foss gitlab-org/gitlab})
     #
     # Returns an ActiveRecord::Relation.
     def where_full_path_in(paths)
diff --git a/app/models/concerns/sha_attribute.rb b/app/models/concerns/sha_attribute.rb
index 177004deba6..c5826f58966 100644
--- a/app/models/concerns/sha_attribute.rb
+++ b/app/models/concerns/sha_attribute.rb
@@ -14,7 +14,7 @@ module ShaAttribute
 
     # This only gets executed in non-production environments as an additional check to ensure
     # the column is the correct type.  In production it should behave like any other attribute.
-    # See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5502 for more discussion
+    # See https://gitlab.com/gitlab-org/gitlab/merge_requests/5502 for more discussion
     def validate_binary_column_exists!(name)
       return unless database_exists?