diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/models/dependency_proxy | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/models/dependency_proxy')
-rw-r--r-- | app/models/dependency_proxy/blob.rb | 3 | ||||
-rw-r--r-- | app/models/dependency_proxy/image_ttl_group_policy.rb | 11 | ||||
-rw-r--r-- | app/models/dependency_proxy/manifest.rb | 3 |
3 files changed, 17 insertions, 0 deletions
diff --git a/app/models/dependency_proxy/blob.rb b/app/models/dependency_proxy/blob.rb index 3a81112340a..5de6b1cf28f 100644 --- a/app/models/dependency_proxy/blob.rb +++ b/app/models/dependency_proxy/blob.rb @@ -8,6 +8,9 @@ class DependencyProxy::Blob < ApplicationRecord validates :group, presence: true validates :file, presence: true validates :file_name, presence: true + validates :status, presence: true + + enum status: { default: 0, expired: 1 } mount_file_store_uploader DependencyProxy::FileUploader diff --git a/app/models/dependency_proxy/image_ttl_group_policy.rb b/app/models/dependency_proxy/image_ttl_group_policy.rb new file mode 100644 index 00000000000..5a1b8cb8f1f --- /dev/null +++ b/app/models/dependency_proxy/image_ttl_group_policy.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class DependencyProxy::ImageTtlGroupPolicy < ApplicationRecord + self.primary_key = :group_id + + belongs_to :group + + validates :group, presence: true + validates :enabled, inclusion: { in: [true, false] } + validates :ttl, numericality: { greater_than: 0 }, allow_nil: true +end diff --git a/app/models/dependency_proxy/manifest.rb b/app/models/dependency_proxy/manifest.rb index d613d5708f0..15e5137b50a 100644 --- a/app/models/dependency_proxy/manifest.rb +++ b/app/models/dependency_proxy/manifest.rb @@ -9,6 +9,9 @@ class DependencyProxy::Manifest < ApplicationRecord validates :file, presence: true validates :file_name, presence: true validates :digest, presence: true + validates :status, presence: true + + enum status: { default: 0, expired: 1 } mount_file_store_uploader DependencyProxy::FileUploader |