Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 5 deletions

diff --git a/app/models/jira_import_state.rb b/app/models/jira_import_state.rb
index ec1b8f03d36..543ee77917c 100644
--- a/app/models/jira_import_state.rb
+++ b/app/models/jira_import_state.rb
@@ -12,6 +12,8 @@ class JiraImportState < ApplicationRecord
   belongs_to :user
   belongs_to :label
 
+  scope :by_jira_project_key, -> (jira_project_key) { where(jira_project_key: jira_project_key) }
+
   validates :project, presence: true
   validates :jira_project_key, presence: true
   validates :jira_project_name, presence: true
diff --git a/app/models/project.rb b/app/models/project.rb
index ee4cc6157eb..443b44dd023 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1190,14 +1190,14 @@ class Project < ApplicationRecord
   end
 
   def external_issue_tracker
-    if has_external_issue_tracker.nil? # To populate existing projects
+    if has_external_issue_tracker.nil?
       cache_has_external_issue_tracker
     end
 
     if has_external_issue_tracker?
-      return @external_issue_tracker if defined?(@external_issue_tracker)
-
-      @external_issue_tracker = services.external_issue_trackers.first
+      strong_memoize(:external_issue_tracker) do
+        services.external_issue_trackers.first
+      end
     else
       nil
     end
@@ -1217,7 +1217,7 @@ class Project < ApplicationRecord
 
   def external_wiki
     if has_external_wiki.nil?
-      cache_has_external_wiki # Populate
+      cache_has_external_wiki
     end
 
     if has_external_wiki