Add latest changes from gitlab-org/gitlab@master

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." %