diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-28 18:09:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-28 18:09:17 +0300 |
| commit | 5bb54b8711a6fd0993ab014f6749cbb74c7b071b (patch) | |
| tree | 199523e0396170c053798dd470aac0c618ee9b14 /app/views/import | |
| parent | eea806d673f060c2660c84ef8fe7f964824460de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/import')
| -rw-r--r-- | app/views/import/fogbugz/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/fogbugz/new_user_map.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/fogbugz/status.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml index b74262f2567..bd0e4b51a63 100644 --- a/app/views/import/fogbugz/new.html.haml +++ b/app/views/import/fogbugz/new.html.haml @@ -8,7 +8,7 @@ = _('Import projects from FogBugz') %hr -= form_tag callback_import_fogbugz_path do += form_tag callback_import_fogbugz_path(namespace_id: params[:namespace_id]) do %p = _("To get started you enter your FogBugz URL and login information below. In the next steps, you'll be able to map users and select the projects you want to import.") .form-group.row diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml index 5caee78b9c4..28836055e0e 100644 --- a/app/views/import/fogbugz/new_user_map.html.haml +++ b/app/views/import/fogbugz/new_user_map.html.haml @@ -8,7 +8,7 @@ = _('Import projects from FogBugz') %hr -= form_tag create_user_map_import_fogbugz_path do += form_tag create_user_map_import_fogbugz_path(namespace_id: params[:namespace_id]) do %p = _("Customize how FogBugz email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import.") %p diff --git a/app/views/import/fogbugz/status.html.haml b/app/views/import/fogbugz/status.html.haml index 3e303d3163d..fb05e8e9724 100644 --- a/app/views/import/fogbugz/status.html.haml +++ b/app/views/import/fogbugz/status.html.haml @@ -8,4 +8,4 @@ - link_to_customize = link_to('customize', new_user_map_import_fogbugz_path) = _('Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab.').html_safe % { link_to_customize: link_to_customize } %hr -= render 'import/githubish_status', provider: 'fogbugz', filterable: false += render 'import/githubish_status', provider: 'fogbugz', filterable: false, default_namespace: @namespace |