Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 2 insertions, 11 deletions

diff --git a/lib/error_tracking/sentry_client.rb b/lib/error_tracking/sentry_client.rb
index 713cec7a7d6..dea60fff04c 100644
--- a/lib/error_tracking/sentry_client.rb
+++ b/lib/error_tracking/sentry_client.rb
@@ -17,14 +17,9 @@ module ErrorTracking
 
     attr_accessor :url, :token
 
-    def initialize(api_url, token, validate_size_guarded_by_feature_flag: false)
+    def initialize(api_url, token)
       @url = api_url
       @token = token
-      @validate_size_guarded_by_feature_flag = validate_size_guarded_by_feature_flag
-    end
-
-    def validate_size_guarded_by_feature_flag?
-      @validate_size_guarded_by_feature_flag
     end
 
     private
@@ -103,7 +98,7 @@ module ErrorTracking
     def handle_response(response)
       raise_error "Sentry response status code: #{response.code}" unless response.code.between?(200, 204)
 
-      validate_size(response.parsed_response) if validate_size_guarded_by_feature_flag?
+      validate_size(response.parsed_response)
 
       { body: response.parsed_response, headers: response.headers }
     end
diff --git a/lib/error_tracking/sentry_client/issue.rb b/lib/error_tracking/sentry_client/issue.rb
index 5e2e0787a3f..359617328cb 100644
--- a/lib/error_tracking/sentry_client/issue.rb
+++ b/lib/error_tracking/sentry_client/issue.rb
@@ -18,10 +18,6 @@ module ErrorTracking
         issues = response[:issues]
         pagination = response[:pagination]
 
-        # We check validate size only with feture flag disabled because when
-        # enabled we already check it when parsing the response.
-        validate_size(issues) unless validate_size_guarded_by_feature_flag?
-
         handle_mapping_exceptions do
           {
             issues: map_to_errors(issues),