diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 21:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 21:09:34 +0300 |
| commit | 141902c04943d5fb43c014b8cf42af60a3bc0cdf (patch) | |
| tree | 7e5a31fe9b0434fa0071cb5d09273669c3a8acab /app/views | |
| parent | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/import/jira/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/import_csv/_button.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/import/jira/show.html.haml b/app/views/projects/import/jira/show.html.haml index cfc4baa1c25..6003f33f0ba 100644 --- a/app/views/projects/import/jira/show.html.haml +++ b/app/views/projects/import/jira/show.html.haml @@ -1,5 +1,7 @@ - if Feature.enabled?(:jira_issue_import_vue, @project) - .js-jira-import-root{ data: { project_path: @project.full_path } } + .js-jira-import-root{ data: { project_path: @project.full_path, + is_jira_configured: @is_jira_configured.to_s, + setup_illustration: image_path('illustrations/manual_action.svg') } } - else - title = _('Jira Issue Import') - page_title title diff --git a/app/views/projects/issues/import_csv/_button.html.haml b/app/views/projects/issues/import_csv/_button.html.haml index 0a352d26b0b..07c34b51037 100644 --- a/app/views/projects/issues/import_csv/_button.html.haml +++ b/app/views/projects/issues/import_csv/_button.html.haml @@ -1,6 +1,6 @@ - type = local_assigns.fetch(:type, :icon) -- if Feature.enabled?(:jira_issue_import, @project) +- if @project.jira_issues_import_feature_flag_enabled? .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' } |