diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_pages.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/gitea/new.html.haml | 1 | ||||
| -rw-r--r-- | app/views/import/gitea/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_import_project_pane.html.haml | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index 74903d52f25..5ef8a24ba39 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -19,7 +19,7 @@ = f.label :max_pages_size, _('Maximum size of pages (MB)'), class: 'label-bold' = f.number_field :max_pages_size, class: 'form-control gl-form-input' .form-text.text-muted - - pages_link_url = help_page_path('administration/pages/index', anchor: 'set-global-maximum-pages-size-per-project') + - pages_link_url = help_page_path('administration/pages/index', anchor: 'set-maximum-size-of-gitlab-pages-site-in-a-project') - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url } = s_('AdminSettings|Set the maximum size of GitLab Pages per project (0 for unlimited). %{link_start}Learn more.%{link_end}').html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe } %h5 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 diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml index c60124ecac0..cb15858a935 100644 --- a/app/views/projects/_import_project_pane.html.haml +++ b/app/views/projects/_import_project_pane.html.haml @@ -53,7 +53,7 @@ - if gitea_import_enabled? %div - = link_to new_import_gitea_path, class: 'gl-button btn-default btn import_gitea js-import-project-btn', data: { platform: 'gitea', **tracking_attrs_data(track_label, 'click_button', 'gitea') } do + = link_to new_import_gitea_path(namespace_id: namespace_id), class: 'gl-button btn-default btn import_gitea js-import-project-btn', data: { platform: 'gitea', **tracking_attrs_data(track_label, 'click_button', 'gitea') } do .gl-button-icon = custom_icon('gitea_logo') Gitea |