diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
| commit | 4bdfcf93f224edb9c4daff90d95b0c6c92766ea3 (patch) | |
| tree | cedf1f94561571d00033c48846ad3959af64449b /app/views/import | |
| parent | fb5d3cceb8d43f8c2dc22a5d8c74327e9397f2e8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/import')
| -rw-r--r-- | app/views/import/_githubish_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/github/status.html.haml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml index 8545b5fd71d..5eae48fd237 100644 --- a/app/views/import/_githubish_status.html.haml +++ b/app/views/import/_githubish_status.html.haml @@ -8,6 +8,7 @@ - details_path = local_assigns.fetch(:details_path, nil) - provider_title = Gitlab::ImportSources.title(local_assigns.fetch(:provider)) - optional_stages = local_assigns.fetch(:optional_stages, []) +- status_import_github_group_path = local_assigns.fetch(:status_import_github_group_path, '') - header_title _("New project"), new_project_path - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') @@ -19,6 +20,7 @@ jobs_path: url_for([:realtime_changes, :import, provider, { format: :json }]), default_target_namespace: default_namespace_path, import_path: url_for([:import, provider, { format: :json }]), + status_import_github_group_path: status_import_github_group_path, cancel_path: cancel_path, details_path: details_path, filterable: filterable.to_s, diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml index 45b5a9408be..b07374e5b5f 100644 --- a/app/views/import/github/status.html.haml +++ b/app/views/import/github/status.html.haml @@ -12,4 +12,5 @@ default_namespace: @namespace, cancel_path: cancel_import_github_path, details_path: details_import_github_path, + status_import_github_group_path: status_import_github_group_path(format: :json), optional_stages: Gitlab::GithubImport::Settings.stages_array |