Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 10 insertions, 11 deletions

diff --git a/app/services/error_tracking/list_projects_service.rb b/app/services/error_tracking/list_projects_service.rb
index 625addaf915..2f23d47029c 100644
--- a/app/services/error_tracking/list_projects_service.rb
+++ b/app/services/error_tracking/list_projects_service.rb
@@ -19,19 +19,18 @@ module ErrorTracking
     end
 
     def project_error_tracking_setting
-      @project_error_tracking_setting ||= begin
-        (super || project.build_error_tracking_setting).tap do |setting|
-          setting.api_url = ErrorTracking::ProjectErrorTrackingSetting.build_api_url_from(
-            api_host: params[:api_host],
-            organization_slug: 'org',
-            project_slug: 'proj'
-          )
-
-          setting.token = token(setting)
-          setting.enabled = true
-        end
+      (super || project.build_error_tracking_setting).tap do |setting|
+        setting.api_url = ErrorTracking::ProjectErrorTrackingSetting.build_api_url_from(
+          api_host: params[:api_host],
+          organization_slug: 'org',
+          project_slug: 'proj'
+        )
+
+        setting.token = token(setting)
+        setting.enabled = true
       end
     end
+    strong_memoize_attr :project_error_tracking_setting
 
     def token(setting)
       # Use param token if not masked, otherwise use database token