Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-15 21:08:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-15 21:08:43 +0300
commit3caf5a8a007d8d9e9a86b7c847b5d9cfa6d41843 (patch)
tree6831279652bf5379c4650e2fd44c69663e1260c8 /app/views/projects/import
parent4774fa00b74a9248b2d14fc424a8c2f1abb0a0de (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/import')
-rw-r--r--app/views/projects/import/jira/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/import/jira/show.html.haml b/app/views/projects/import/jira/show.html.haml
index a3e81521648..fe6cc6fa828 100644
--- a/app/views/projects/import/jira/show.html.haml
+++ b/app/views/projects/import/jira/show.html.haml
@@ -1,6 +1,6 @@
.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&.valid_connection?.to_s,
+ 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') } }