Commit 18f6ea6c authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '208907-allow-activation-of-jira-import' into 'master'

Default :jira_issue_import_vue frontend feature flag to on

See merge request gitlab-org/gitlab!29671
parents 43f856a2 baf995af
...@@ -24,7 +24,7 @@ module Projects ...@@ -24,7 +24,7 @@ module Projects
end end
end end
unless Feature.enabled?(:jira_issue_import_vue, @project) unless Feature.enabled?(:jira_issue_import_vue, @project, default_enabled: true)
flash[:notice] = _("Import %{status}") % { status: @project.jira_import_status } unless @project.latest_jira_import&.initial? flash[:notice] = _("Import %{status}") % { status: @project.jira_import_status } unless @project.latest_jira_import&.initial?
end end
end end
...@@ -51,7 +51,7 @@ module Projects ...@@ -51,7 +51,7 @@ module Projects
end end
def jira_integration_configured? def jira_integration_configured?
return if Feature.enabled?(:jira_issue_import_vue, @project) return if Feature.enabled?(:jira_issue_import_vue, @project, default_enabled: true)
return if @project.jira_service return if @project.jira_service
flash[:notice] = _("Configure the Jira integration first on your project's %{strong_start} Settings > Integrations > Jira%{strong_end} page." % flash[:notice] = _("Configure the Jira integration first on your project's %{strong_start} Settings > Integrations > Jira%{strong_end} page." %
......
- if Feature.enabled?(:jira_issue_import_vue, @project) - if Feature.enabled?(:jira_issue_import_vue, @project, default_enabled: true)
.js-jira-import-root{ data: { project_path: @project.full_path, .js-jira-import-root{ data: { project_path: @project.full_path,
issues_path: project_issues_path(@project), issues_path: project_issues_path(@project),
is_jira_configured: @project.jira_service.present?.to_s, is_jira_configured: @project.jira_service.present?.to_s,
......
---
title: Redesign Jira issue import UI
merge_request: 29671
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment