diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/views/projects/import | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/views/projects/import')
-rw-r--r-- | app/views/projects/import/jira/show.html.haml | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/app/views/projects/import/jira/show.html.haml b/app/views/projects/import/jira/show.html.haml index cddd97cbc84..fe6cc6fa828 100644 --- a/app/views/projects/import/jira/show.html.haml +++ b/app/views/projects/import/jira/show.html.haml @@ -1,33 +1,6 @@ -- if Feature.enabled?(:jira_issue_import_vue, @project, default_enabled: true) - .js-jira-import-root{ data: { project_path: @project.full_path, - issues_path: project_issues_path(@project), - jira_integration_path: edit_project_service_path(@project, :jira), - is_jira_configured: @project.jira_service.present?.to_s, - jira_projects: @jira_projects.to_json, - in_progress_illustration: image_path('illustrations/export-import.svg'), - setup_illustration: image_path('illustrations/manual_action.svg') } } -- else - - title = _('Jira Issue Import') - - page_title title - - breadcrumb_title title - - header_title _("Projects"), root_path - - = render 'import/shared/errors' - - - if @project.import_state&.in_progress? - %h3.page-title.d-flex.align-items-center - = sprite_icon('issues', size: 16, css_class: 'mr-1') - = _('Import in progress') - - elsif @jira_projects.present? - %h3.page-title.d-flex.align-items-center - = sprite_icon('issues', size: 16, css_class: 'mr-1') - = _('Import issues from Jira') - - = form_tag import_project_import_jira_path(@project), method: :post do - .form-group.row - = label_tag :jira_project_key, _('From project'), class: 'col-form-label col-md-2' - .col-md-4 - = select_tag :jira_project_key, options_for_select(@jira_projects, ''), { class: 'select2' } - .form-actions - = submit_tag _('Import issues'), class: 'btn btn-success' - = link_to _('Cancel'), project_issues_path(@project), class: 'btn btn-cancel' +.js-jira-import-root{ data: { project_path: @project.full_path, + issues_path: project_issues_path(@project), + jira_integration_path: edit_project_service_path(@project, :jira), + is_jira_configured: @project.jira_service&.active? && @project.jira_service&.valid_connection?.to_s, + in_progress_illustration: image_path('illustrations/export-import.svg'), + setup_illustration: image_path('illustrations/manual_action.svg') } } |