Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index b510129b35d..7a7e485a95a 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -60,12 +60,11 @@ module AtomicInternalId
         iid_always_track = Feature.enabled?(:iid_always_track, default_enabled: true)
         return unless @internal_id_needs_tracking || iid_always_track
 
-        @internal_id_needs_tracking = false
-
         scope_value = internal_id_read_scope(scope)
-        value = read_attribute(column)
         return unless scope_value
 
+        value = read_attribute(column)
+
         if value.present?
           # The value was set externally, e.g. by the user
           # We update the InternalId record to keep track of the greatest value.
@@ -75,6 +74,8 @@ module AtomicInternalId
             internal_id_scope_usage,
             value,
             init)
+
+          @internal_id_needs_tracking = false
         end
       end