summaryrefslogtreecommitdiff
path: root/app/controllers/projects/import
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-18 15:10:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-18 15:10:16 +0000
commitc8cc2fe990c52cabcb9912b2b01b5bf16b33d88f (patch)
tree101b52764100d09d0f49e9277cfd7ac5383e7aeb /app/controllers/projects/import
parent38a1a6cb91bd4cd95d18db9a4bfd219bfb75401b (diff)
downloadgitlab-ce-c8cc2fe990c52cabcb9912b2b01b5bf16b33d88f.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.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/import/jira_controller.rb b/app/controllers/projects/import/jira_controller.rb
index 8418a607659..46c4761b0ea 100644
--- a/app/controllers/projects/import/jira_controller.rb
+++ b/app/controllers/projects/import/jira_controller.rb
@@ -25,9 +25,9 @@ module Projects
false
end
- def jira_service
- strong_memoize(:jira_service) do
- @project.jira_service
+ def jira_integration
+ strong_memoize(:jira_integration) do
+ @project.jira_integration
end
end