8469f59d78
This backports all EE schema changes to CE, including EE migrations, ensuring both use the same schema. == Updated tests A spec related to ghost and support bot users had to be modified to make it pass. The spec in question assumes that the "support_bot" column exists when defining the spec. In the single codebase setup this is not the case, as the column is backported in a later migration. Any attempt to use a different schema version or use of "around" blocks to conditionally disable specs won't help, as reverting the backport migration would also drop the "support_bot" column. Removing the "support_bot" tests entirely appears to be the only solution. We also need to update some foreign key tests now that we have backported the EE columns. Fortunately, these changes are very minor. == Backporting migrations This commit moves EE specific migrations (except those for the Geo tracking database) and related files to CE, and also removes any traces of the ee/db directory. Some migrations had to be modified or removed, as they no longer work with the schema being backported. These migrations were all quite old, so we opted for removing them where modifying them would take too much time and effort. Some old migrations were modified in EE, while also existing in CE. In these cases we took the EE code, and in one case removed them entirely. It's not worth spending time trying to merge these changes somehow as we plan to remove old migrations around the release of 12.0, see https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
49 lines
1.9 KiB
Ruby
49 lines
1.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Gitlab
|
|
module ImportExport
|
|
class Reader
|
|
attr_reader :tree, :attributes_finder
|
|
|
|
def initialize(shared:)
|
|
@shared = shared
|
|
config_hash = ImportExport::Config.new.to_h.deep_symbolize_keys
|
|
@tree = config_hash[:project_tree]
|
|
@attributes_finder = Gitlab::ImportExport::AttributesFinder.new(included_attributes: config_hash[:included_attributes],
|
|
excluded_attributes: config_hash[:excluded_attributes],
|
|
methods: config_hash[:methods])
|
|
end
|
|
|
|
# Outputs a hash in the format described here: http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html
|
|
# for outputting a project in JSON format, including its relations and sub relations.
|
|
def project_tree
|
|
attributes = @attributes_finder.find(:project)
|
|
project_attributes = attributes.is_a?(Hash) ? attributes[:project] : {}
|
|
|
|
project_attributes.merge(include: build_hash(@tree))
|
|
rescue => e
|
|
@shared.error(e)
|
|
false
|
|
end
|
|
|
|
def group_members_tree
|
|
@attributes_finder.find_included(:project_members).merge(include: @attributes_finder.find(:user))
|
|
end
|
|
|
|
private
|
|
|
|
# Builds a hash in the format described here: http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html
|
|
#
|
|
# +model_list+ - List of models as a relation tree to be included in the generated JSON, from the _import_export.yml_ file
|
|
def build_hash(model_list)
|
|
model_list.map do |model_objects|
|
|
if model_objects.is_a?(Hash)
|
|
Gitlab::ImportExport::JsonHashBuilder.build(model_objects, @attributes_finder)
|
|
else
|
|
@attributes_finder.find(model_objects)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|