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/workers/gitlab | |
| parent | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/gitlab')
| -rw-r--r-- | app/workers/gitlab/jira_import/stage/start_import_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/gitlab/jira_import/stage/start_import_worker.rb b/app/workers/gitlab/jira_import/stage/start_import_worker.rb index 1561ad90cc1..5b36feadbd1 100644 --- a/app/workers/gitlab/jira_import/stage/start_import_worker.rb +++ b/app/workers/gitlab/jira_import/stage/start_import_worker.rb @@ -25,7 +25,7 @@ module Gitlab def start_import return false unless project - return false if Feature.disabled?(:jira_issue_import, project) + return false unless project.jira_issues_import_feature_flag_enabled? return true if start(project.latest_jira_import) Gitlab::Import::Logger.info( |