Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-12-30 06:10:31 +00:00
parent d1797e00cd
commit a5b1631549
3 changed files with 3 additions and 2 deletions

View File

@ -2,7 +2,7 @@
- project = local_assigns.fetch(:project)
.sub-section
.sub-section{ data: { qa_selector: 'export_project_content' } }
%h4= _('Export project')
%p= _('Export this project with all its related data in order to move your project to a new GitLab instance. Once the export is finished, you can import the file from the "New Project" page.')

View File

@ -26,6 +26,7 @@ module QA
view 'app/views/projects/_export.html.haml' do
element :export_project_link
element :download_export_link
element :export_project_content
end
def update_project_path_to(path)

View File

@ -32,7 +32,7 @@ module QA
end
end
it 'allows a project to be created via the CLI with a different default branch name', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1019' do
it 'allows a project to be created via the CLI with a different default branch name', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1019', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/295305', type: :flaky } do
project_name = "default-branch-name-via-cli-#{SecureRandom.hex(8)}"
group = Resource::Group.fabricate_via_api!