diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 12:09:34 +0000 |
| commit | 903ccf7c93eb9490c76857bffe744249cc07de09 (patch) | |
| tree | 603a3162e91999160e4efc74f351f9405f422d61 /app/controllers/projects/import | |
| parent | 41cb558299b483b44b45351730ee4c0e9fe4ca2c (diff) | |
| download | gitlab-ce-903ccf7c93eb9490c76857bffe744249cc07de09.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/import')
| -rw-r--r-- | app/controllers/projects/import/jira_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/import/jira_controller.rb b/app/controllers/projects/import/jira_controller.rb index 6af630a9528..c8f53cef5b2 100644 --- a/app/controllers/projects/import/jira_controller.rb +++ b/app/controllers/projects/import/jira_controller.rb @@ -7,6 +7,8 @@ module Projects before_action :jira_integration_configured? def show + return if Feature.enabled?(:jira_issue_import_vue, @project) + unless @project.import_state&.in_progress? jira_client = @project.jira_service.client jira_projects = jira_client.Project.all |