From 2e4c4055181eec9186458dd5dd3219c937032ec7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Apr 2020 12:09:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/jira_import/start_import_service.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/services') diff --git a/app/services/jira_import/start_import_service.rb b/app/services/jira_import/start_import_service.rb index 134cef089e7..6accc3cfffc 100644 --- a/app/services/jira_import/start_import_service.rb +++ b/app/services/jira_import/start_import_service.rb @@ -46,6 +46,7 @@ module JiraImport def validate return build_error_response(_('Jira import feature is disabled.')) unless project.jira_issues_import_feature_flag_enabled? return build_error_response(_('You do not have permissions to run the import.')) unless user.can?(:admin_project, project) + return build_error_response(_('Cannot import because issues are not available in this project.')) unless project.feature_available?(:issues, user) return build_error_response(_('Jira integration not configured.')) unless project.jira_service&.active? return build_error_response(_('Unable to find Jira project to import data from.')) if jira_project_key.blank? return build_error_response(_('Jira import is already running.')) if import_in_progress? -- cgit v1.2.3