diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 15:09:56 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 15:09:56 +0000 |
commit | c08d9c22569d1c9e7c7737e183969593394133d9 (patch) | |
tree | 8ce1722f852f8921656080e04f6c9e16fa71ddb5 /app/views/projects | |
parent | 546ddc3f6ac96fdf09934390a938bb391d07dc94 (diff) | |
download | gitlab-ce-c08d9c22569d1c9e7c7737e183969593394133d9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/issues/_nav_btns.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/import_csv/_button.html.haml | 27 |
2 files changed, 20 insertions, 9 deletions
diff --git a/app/views/projects/issues/_nav_btns.html.haml b/app/views/projects/issues/_nav_btns.html.haml index d81089bee68..c347b8d2c9c 100644 --- a/app/views/projects/issues/_nav_btns.html.haml +++ b/app/views/projects/issues/_nav_btns.html.haml @@ -6,7 +6,7 @@ - if show_feed_buttons = render 'shared/issuable/feed_buttons' - .btn-group.append-right-10< + .btn-group - if show_export_button = render_if_exists 'projects/issues/export_csv/button' diff --git a/app/views/projects/issues/import_csv/_button.html.haml b/app/views/projects/issues/import_csv/_button.html.haml index 78c561e81ef..0a352d26b0b 100644 --- a/app/views/projects/issues/import_csv/_button.html.haml +++ b/app/views/projects/issues/import_csv/_button.html.haml @@ -1,11 +1,22 @@ - type = local_assigns.fetch(:type, :icon) -%button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon), - data: { toggle: 'modal', target: '.issues-import-modal' } } - - if type == :icon - = sprite_icon('import') - - else - = _('Import CSV') - - if Feature.enabled?(:jira_issue_import, @project) - = link_to _("Import Jira issues"), project_import_jira_path(@project), class: "btn btn-default" + .dropdown.btn-group + %button.btn.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon), + data: { toggle: 'dropdown' }, 'aria-label' => _('Import issues'), 'aria-haspopup' => 'true', 'aria-expanded' => 'false' } + - if type == :icon + = sprite_icon('import') + - else + = _('Import issues') + %ul.dropdown-menu + %li + %button.btn{ data: { toggle: 'modal', target: '.issues-import-modal' } } + = _('Import CSV') + %li= link_to _('Import from Jira'), project_import_jira_path(@project) +- else + %button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon), + data: { toggle: 'modal', target: '.issues-import-modal' } } + - if type == :icon + = sprite_icon('import') + - else + = _('Import CSV') |