summaryrefslogtreecommitdiff
path: root/app/views/import
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 15:09:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 15:09:21 +0000
commitd2675fa4de909714fcc6dc1bdd7bee9ce5e3af34 (patch)
tree0c0fbdd55fbb3a1616b10775113bf8320c9529c8 /app/views/import
parent48d25238c386a89e8a6af218eeb290936a8f7595 (diff)
downloadgitlab-ce-d2675fa4de909714fcc6dc1bdd7bee9ce5e3af34.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/import')
-rw-r--r--app/views/import/gitea/new.html.haml1
-rw-r--r--app/views/import/gitea/status.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index a7feedd91ad..4a293bb6f4e 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -11,6 +11,7 @@
= _('To get started, please enter your Gitea Host URL and a %{link_to_personal_token}.').html_safe % { link_to_personal_token: link_to_personal_token }
= form_tag personal_access_token_import_gitea_path do
+ = hidden_field_tag(:namespace_id, params[:namespace_id])
.form-group.row
= label_tag :gitea_host_url, _('Gitea Host URL'), class: 'col-form-label col-sm-2'
.col-sm-4
diff --git a/app/views/import/gitea/status.html.haml b/app/views/import/gitea/status.html.haml
index 2e318f77b7c..c717d4848f4 100644
--- a/app/views/import/gitea/status.html.haml
+++ b/app/views/import/gitea/status.html.haml
@@ -3,4 +3,4 @@
= custom_icon('gitea_logo')
= _('Import Projects from Gitea')
-= render 'import/githubish_status', provider: 'gitea'
+= render 'import/githubish_status', provider: 'gitea', default_namespace: @namespace