diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
| commit | 418cb3714af8337cc7b727098dd5e5d56e387e54 (patch) | |
| tree | 93c7184ea4111354c01f1fad513c2e4f41e35a62 /app/models/concerns/internal_id.rb | |
| parent | 797ffb4a784d1183f2c6b9e67cec55fd3424dec8 (diff) | |
| parent | 3541a259327061d10c04a5b287aca9349e0c7860 (diff) | |
Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'
Prepare 10.4 RC8 release
See merge request gitlab-org/gitlab-ce!16557
Diffstat (limited to 'app/models/concerns/internal_id.rb')
| -rw-r--r-- | app/models/concerns/internal_id.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/concerns/internal_id.rb b/app/models/concerns/internal_id.rb index a3d0ac8d862..01079fb8bd6 100644 --- a/app/models/concerns/internal_id.rb +++ b/app/models/concerns/internal_id.rb @@ -10,7 +10,6 @@ module InternalId if iid.blank? parent = project || group records = parent.public_send(self.class.name.tableize) # rubocop:disable GitlabSecurity/PublicSend - records = records.with_deleted if self.paranoid? max_iid = records.maximum(:iid) self.iid = max_iid.to_i + 1 |