diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 00:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 00:10:15 +0300 |
| commit | 4cf8d931aa8511aa93b8504e940d2f5ddfee7b4c (patch) | |
| tree | 1c2cd88c4d895757f08b73708bf49b182cc0a715 /app/models | |
| parent | fbe6bd7c6aae0beb81fa47d5834393ed92662885 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request_diff_commit.rb | 5 | ||||
| -rw-r--r-- | app/models/packages/npm/metadata_cache.rb | 6 | ||||
| -rw-r--r-- | app/models/protected_branch.rb | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/app/models/merge_request_diff_commit.rb b/app/models/merge_request_diff_commit.rb index 15fb356cb6d..790520c4123 100644 --- a/app/models/merge_request_diff_commit.rb +++ b/app/models/merge_request_diff_commit.rb @@ -6,13 +6,8 @@ class MergeRequestDiffCommit < ApplicationRecord include BulkInsertSafe include ShaAttribute include CachedCommit - include IgnorableColumns include FromUnion - ignore_column %i[author_name author_email committer_name committer_email], - remove_with: '14.6', - remove_after: '2021-11-22' - belongs_to :merge_request_diff # This relation is called `commit_author` and not `author`, as the project diff --git a/app/models/packages/npm/metadata_cache.rb b/app/models/packages/npm/metadata_cache.rb index 02efeda69cb..b6ab2a88a98 100644 --- a/app/models/packages/npm/metadata_cache.rb +++ b/app/models/packages/npm/metadata_cache.rb @@ -5,6 +5,9 @@ module Packages class MetadataCache < ApplicationRecord include FileStoreMounter include Packages::Downloadable + include Packages::Destructible + + enum status: { default: 0, processing: 1, error: 3 } belongs_to :project, inverse_of: :npm_metadata_caches @@ -18,6 +21,9 @@ module Packages before_validation :set_object_storage_key attr_readonly :object_storage_key + scope :stale, -> { where(project_id: nil) } + scope :pending_destruction, -> { stale.default } + def self.find_or_build(package_name:, project_id:) find_or_initialize_by( package_name: package_name, diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index aebce59a040..40a1a4392dd 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -5,6 +5,7 @@ class ProtectedBranch < ApplicationRecord include Gitlab::SQL::Pattern include FromUnion include EachBatch + include Presentable belongs_to :group, foreign_key: :namespace_id, touch: true, inverse_of: :protected_branches |