Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-15 03:10:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-15 03:10:45 +0300
commit8b75948934667904196aba319aedda25b00f06ff (patch)
tree5f743f14301b5abe868a35fad87bfa0fc0581f04 /app/models/concerns/packages
parent8f534e1e960eef1f4cfcb7c6d723840523515ffb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/packages')
-rw-r--r--app/models/concerns/packages/debian/distribution.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/packages/debian/distribution.rb b/app/models/concerns/packages/debian/distribution.rb
index 948d4197285..285d293c9ee 100644
--- a/app/models/concerns/packages/debian/distribution.rb
+++ b/app/models/concerns/packages/debian/distribution.rb
@@ -70,6 +70,7 @@ module Packages
scope :with_container, ->(subject) { where(container_type => subject) }
scope :with_codename, ->(codename) { where(codename: codename) }
scope :with_suite, ->(suite) { where(suite: suite) }
+ scope :with_codename_or_suite, ->(codename_or_suite) { with_codename(codename_or_suite).or(with_suite(codename_or_suite)) }
attr_encrypted :signing_keys,
mode: :per_attribute_iv,