diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 15:08:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 15:08:44 +0000 |
| commit | bcc77054ee9aefd1e332e04a4189390fd5a3112e (patch) | |
| tree | e6e1908c310e4733038794e932196cae0d66ba9a /app/models/container_expiration_policy.rb | |
| parent | 05b5c609cb8c260b10c2eb1b92b711dc82d32c3f (diff) | |
| download | gitlab-ce-bcc77054ee9aefd1e332e04a4189390fd5a3112e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/container_expiration_policy.rb')
| -rw-r--r-- | app/models/container_expiration_policy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/container_expiration_policy.rb b/app/models/container_expiration_policy.rb index c929a78a7f9..ccb0a0f8acd 100644 --- a/app/models/container_expiration_policy.rb +++ b/app/models/container_expiration_policy.rb @@ -14,7 +14,7 @@ class ContainerExpirationPolicy < ApplicationRecord validates :keep_n, inclusion: { in: ->(_) { self.keep_n_options.keys } }, allow_nil: true scope :active, -> { where(enabled: true) } - scope :preloaded, -> { preload(:project) } + scope :preloaded, -> { preload(project: [:route]) } def self.keep_n_options { |