Commit 7a61f47b authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'import_project_issue' into 'master'

Fix 404 when importing gitlab project using right click

See merge request gitlab-org/gitlab!81507
parents 7996a03e 701a6936
...@@ -144,8 +144,8 @@ const bindEvents = () => { ...@@ -144,8 +144,8 @@ const bindEvents = () => {
bindHowToImport(); bindHowToImport();
$('.btn_import_gitlab_project').on('click', () => { $('.btn_import_gitlab_project').on('click contextmenu', () => {
const importHref = $('a.btn_import_gitlab_project').attr('href'); const importHref = $('a.btn_import_gitlab_project').attr('data-href');
$('.btn_import_gitlab_project').attr( $('.btn_import_gitlab_project').attr(
'href', 'href',
`${importHref}?namespace_id=${$( `${importHref}?namespace_id=${$(
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.import-buttons .import-buttons
- if gitlab_project_import_enabled? - if gitlab_project_import_enabled?
.import_gitlab_project.has-tooltip{ data: { container: 'body', qa_selector: 'gitlab_import_button' } } .import_gitlab_project.has-tooltip{ data: { container: 'body', qa_selector: 'gitlab_import_button' } }
= link_to new_import_gitlab_project_path, class: 'gl-button btn-default btn btn_import_gitlab_project js-import-project-btn', data: { platform: 'gitlab_export', **tracking_attrs_data(track_label, 'click_button', 'gitlab_export') } do = link_to '#', class: 'gl-button btn-default btn btn_import_gitlab_project js-import-project-btn', data: { href: new_import_gitlab_project_path, platform: 'gitlab_export', **tracking_attrs_data(track_label, 'click_button', 'gitlab_export') } do
.gl-button-icon .gl-button-icon
= sprite_icon('tanuki') = sprite_icon('tanuki')
= _("GitLab export") = _("GitLab export")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment