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/controllers/projects | |
parent | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/import/jira_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/import/jira_controller.rb b/app/controllers/projects/import/jira_controller.rb index b5adef399c7..ca427928d85 100644 --- a/app/controllers/projects/import/jira_controller.rb +++ b/app/controllers/projects/import/jira_controller.rb @@ -7,6 +7,7 @@ module Projects before_action :jira_integration_configured? def show + @is_jira_configured = @project.jira_service.present? return if Feature.enabled?(:jira_issue_import_vue, @project) unless @project.latest_jira_import&.in_progress? @@ -39,12 +40,13 @@ module Projects private def jira_import_enabled? - return if Feature.enabled?(:jira_issue_import, @project) + return if @project.jira_issues_import_feature_flag_enabled? redirect_to project_issues_path(@project) end def jira_integration_configured? + return if Feature.enabled?(:jira_issue_import_vue, @project) return if @project.jira_service flash[:notice] = _("Configure the Jira integration first on your project's %{strong_start} Settings > Integrations > Jira%{strong_end} page." % |