diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 06:10:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 06:10:03 +0000 |
| commit | 7adadf7e5b83c46f7e83051146624719e9b6bf0d (patch) | |
| tree | 3439c6c97d3345ce9ce4e972e39c57eef5dc2d64 /app/models | |
| parent | fb8d6a526f0ef2da9fb247e15f9ff19279dba3d6 (diff) | |
| download | gitlab-ce-7adadf7e5b83c46f7e83051146624719e9b6bf0d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 519bc53c26c..3af1e671f1c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -127,14 +127,10 @@ class Project < ApplicationRecord after_create :check_repository_absence! acts_as_ordered_taggable_on :topics - # The 'tag_list' alias and the 'tags' association are required during the 'tags -> topics' migration - # TODO: eliminate 'tag_list' and 'tags' in the further process of the migration + # The 'tag_list' alias is required during the 'tags -> topics' migration + # TODO: eliminate 'tag_list' in the further process of the migration # https://gitlab.com/gitlab-org/gitlab/-/issues/328226 alias_attribute :tag_list, :topic_list - has_many :tags, -> { order("#{ActsAsTaggableOn::Tagging.table_name}.id") }, - class_name: 'ActsAsTaggableOn::Tag', - through: :topic_taggings, - source: :tag attr_accessor :old_path_with_namespace attr_accessor :template_name @@ -637,7 +633,7 @@ class Project < ApplicationRecord mount_uploader :bfg_object_map, AttachmentUploader def self.with_api_entity_associations - preload(:project_feature, :route, :tags, :group, :timelogs, namespace: [:route, :owner]) + preload(:project_feature, :route, :topics, :group, :timelogs, namespace: [:route, :owner]) end def self.with_web_entity_associations |