VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-16 15:57:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-07-22 21:16:37 +00:00
parent 4e2a247255
commit 6d61802bb7
56 changed files with 705 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qa/qa/tools/delete_resource_base.rb
View File

@ -39,8 +39,8 @@ module QA
# @param [Hash] resource
# @return [Array<String, Hash>] results
def delete_permanently(resource)
# We need to get the path_with_namespace of the project again since marking it for deletion changes the name
resource = get_resource(resource) if @type.include?('project')
# Get the path of the project or group again since marking it for deletion changes the name
resource = get_resource(resource) if @type.include?('project') || @type.include?('group')
return unless resource
path = resource_path(resource)

9
qa/qa/tools/test_resources_handler.rb
View File

@ -262,12 +262,15 @@ module QA
end
def get_full_path(resource, type)
# We need to get the full path of the project again since marking it for deletion changes the name
if type == 'project'
# Get the full path of the project or group again since marking it for deletion changes the name
if type == 'project' || type == 'group'
response = get_resource(resource['api_path'])
if success?(response&.code)
if success?(response&.code) && type == 'project'
project = parse_body(response)
project[:path_with_namespace]
elsif success?(response&.code) && type == 'group'
group = parse_body(response)
group[:full_path]
end
else
resource['info'].split("'").last