diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:34 +0000 |
commit | 141902c04943d5fb43c014b8cf42af60a3bc0cdf (patch) | |
tree | 7e5a31fe9b0434fa0071cb5d09273669c3a8acab /app/models/project.rb | |
parent | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (diff) | |
download | gitlab-ce-141902c04943d5fb43c014b8cf42af60a3bc0cdf.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 1f968cdfad1..4cd92b119b4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -786,6 +786,10 @@ class Project < ApplicationRecord Feature.enabled?(:context_commits, default_enabled: true) end + def jira_issues_import_feature_flag_enabled? + Feature.enabled?(:jira_issue_import, self) + end + def team @team ||= ProjectTeam.new(self) end @@ -968,7 +972,7 @@ class Project < ApplicationRecord end def jira_import? - import_type == 'jira' && latest_jira_import.present? && Feature.enabled?(:jira_issue_import, self) + import_type == 'jira' && latest_jira_import.present? && jira_issues_import_feature_flag_enabled? end def gitlab_project_import? |