diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-11 21:11:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-11 21:11:57 +0300 |
| commit | 603ee53dbdbd3adaced752e1a119eb40d64e9979 (patch) | |
| tree | 7c3e912fe4c02ea464063a4a224b02bbcdeea580 /lib/gitlab | |
| parent | c79523e3952dad31a9ab8ccbb9e38466fec3aec3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/import_export/project/import_export.yml | 2 | ||||
| -rw-r--r-- | lib/gitlab/object_hierarchy.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml index b912eccf5fe..b6c3da8e564 100644 --- a/lib/gitlab/import_export/project/import_export.yml +++ b/lib/gitlab/import_export/project/import_export.yml @@ -286,6 +286,7 @@ included_attributes: - :container_registry_access_level - :package_registry_access_level - :environments_access_level + - :feature_flags_access_level prometheus_metrics: - :created_at - :updated_at @@ -691,6 +692,7 @@ included_attributes: - :container_registry_access_level - :package_registry_access_level - :environments_access_level + - :feature_flags_access_level - :allow_merge_on_skipped_pipeline - :auto_devops_deploy_strategy - :auto_devops_enabled diff --git a/lib/gitlab/object_hierarchy.rb b/lib/gitlab/object_hierarchy.rb index 9a850246221..0576aed811c 100644 --- a/lib/gitlab/object_hierarchy.rb +++ b/lib/gitlab/object_hierarchy.rb @@ -65,7 +65,8 @@ module Gitlab # Note: By default the order is breadth-first # rubocop: disable CodeReuse/ActiveRecord def base_and_ancestors(upto: nil, hierarchy_order: nil) - cte = base_and_ancestors_cte(upto, hierarchy_order) + upto_id = upto.try(:id) || upto + cte = base_and_ancestors_cte(upto_id, hierarchy_order) recursive_query = if hierarchy_order # othewise depth won't be available for outer query |