diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 21:06:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 21:06:15 +0300 |
commit | 0dfbcd8f8b1587a7e10eb79940a8dc13bd72c664 (patch) | |
tree | 769b7b5eaea4354498ca0b91945e4733895bba43 /app/models/concerns/atomic_internal_id.rb | |
parent | cd631619f465a0eee2fe714e720f6b6312dd3e56 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/atomic_internal_id.rb')
-rw-r--r-- | app/models/concerns/atomic_internal_id.rb | 7 |
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 |