Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 18 deletions

diff --git a/app/components/diffs/overflow_warning_component.rb b/app/components/diffs/overflow_warning_component.rb
index 0d0e225beb4..5123809cfdc 100644
--- a/app/components/diffs/overflow_warning_component.rb
+++ b/app/components/diffs/overflow_warning_component.rb
@@ -2,12 +2,6 @@
 
 module Diffs
   class OverflowWarningComponent < BaseComponent
-    # Skipping coverage because of https://gitlab.com/gitlab-org/gitlab/-/issues/357381
-    #
-    # This is fully tested by the output in the view part of this component,
-    # but undercoverage doesn't understand the relationship between the two parts.
-    #
-    # :nocov:
     def initialize(diffs:, diff_files:, project:, commit: nil, merge_request: nil)
       @diffs = diffs
       @diff_files = diff_files
@@ -68,6 +62,5 @@ module Diffs
     def button_classes
       "btn gl-alert-action btn-default gl-button btn-default-secondary"
     end
-    # :nocov:
   end
 end
diff --git a/app/components/diffs/stats_component.rb b/app/components/diffs/stats_component.rb
index 55589c7b015..74788133aa2 100644
--- a/app/components/diffs/stats_component.rb
+++ b/app/components/diffs/stats_component.rb
@@ -28,13 +28,6 @@ module Diffs
       Gitlab::Json.dump(diffs_map)
     end
 
-    # Disabled undercoverage reports for this method
-    # as it returns a false positive on the last line,
-    # which is covered in the tests
-    #
-    # Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/357381
-    #
-    # :nocov:
     def diff_file_path_text(diff_file, max: 60)
       path = diff_file.new_path
 
@@ -42,7 +35,6 @@ module Diffs
 
       "...#{path[-(max - 3)..]}"
     end
-    # :nocov:
 
     private
 
diff --git a/app/components/pajamas/component.rb b/app/components/pajamas/component.rb
index b05d93b680e..70c5f5be596 100644
--- a/app/components/pajamas/component.rb
+++ b/app/components/pajamas/component.rb
@@ -4,8 +4,6 @@ module Pajamas
   class Component < ViewComponent::Base
     private
 
-    # :nocov:
-
     # Filter a given a value against a list of allowed values
     # If no value is given or value is not allowed return default one
     #
@@ -18,6 +16,5 @@ module Pajamas
 
       default
     end
-    # :nocov:
   end
 end