Add latest changes from gitlab-org/gitlab@master

4 files changed, 17 insertions, 13 deletions

diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 5f05b613288..49817be4f65 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -167,6 +167,20 @@ module Notes
       if Feature.enabled?(:notes_create_service_tracking, project)
         Gitlab::Tracking.event('Notes::CreateService', 'execute', **tracking_data_for(note))
       end
+
+      if Feature.enabled?(:route_hll_to_snowplow_phase4, project&.namespace) && note.for_commit?
+        metric_key_path = 'counts.commit_comment'
+
+        Gitlab::Tracking.event(
+          'Notes::CreateService',
+          'create_commit_comment',
+          project: project,
+          namespace: project&.namespace,
+          user: user,
+          label: metric_key_path,
+          context: [Gitlab::Tracking::ServicePingContext.new(data_source: :redis, key_path: metric_key_path).to_context]
+        )
+      end
     end
 
     def tracking_data_for(note)
diff --git a/app/services/packages/debian/create_package_file_service.rb b/app/services/packages/debian/create_package_file_service.rb
index 19e68183ea2..a2fa31735fa 100644
--- a/app/services/packages/debian/create_package_file_service.rb
+++ b/app/services/packages/debian/create_package_file_service.rb
@@ -3,8 +3,6 @@
 module Packages
   module Debian
     class CreatePackageFileService
-      include ::Packages::FIPS
-
       def initialize(package:, current_user:, params: {})
         @package = package
         @current_user = current_user
@@ -12,7 +10,6 @@ module Packages
       end
 
       def execute
-        raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled?
         raise ArgumentError, "Invalid package" unless package.present?
         raise ArgumentError, "Invalid user" unless current_user.present?
 
diff --git a/app/services/packages/debian/extract_changes_metadata_service.rb b/app/services/packages/debian/extract_changes_metadata_service.rb
index 30480834748..43a4db5bdfc 100644
--- a/app/services/packages/debian/extract_changes_metadata_service.rb
+++ b/app/services/packages/debian/extract_changes_metadata_service.rb
@@ -4,7 +4,6 @@ module Packages
   module Debian
     class ExtractChangesMetadataService
       include Gitlab::Utils::StrongMemoize
-      include ::Packages::FIPS
 
       ExtractionError = Class.new(StandardError)
 
@@ -14,8 +13,6 @@ module Packages
       end
 
       def execute
-        raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled?
-
         {
           file_type: file_type,
           architecture: metadata[:architecture],
diff --git a/app/services/packages/debian/generate_distribution_service.rb b/app/services/packages/debian/generate_distribution_service.rb
index faac3da023e..12ae6c68918 100644
--- a/app/services/packages/debian/generate_distribution_service.rb
+++ b/app/services/packages/debian/generate_distribution_service.rb
@@ -4,7 +4,6 @@ module Packages
   module Debian
     class GenerateDistributionService
       include Gitlab::Utils::StrongMemoize
-      include ::Packages::FIPS
       include ExclusiveLeaseGuard
 
       ONE_HOUR = 1.hour.freeze
@@ -66,13 +65,10 @@ module Packages
       def initialize(distribution)
         @distribution = distribution
         @oldest_kept_generated_at = nil
-        @md5sum = []
         @sha256 = []
       end
 
       def execute
-        raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled?
-
         try_obtain_lease do
           @distribution.transaction do
             # We consider `apt-get update` can take at most one hour
@@ -143,10 +139,10 @@ module Packages
             rfc822_field('Directory', package_dirname(package_file))
           ]
         else
+          # NB: MD5sum was removed for FIPS compliance
           [
             rfc822_field('Filename', "#{package_dirname(package_file)}/#{package_file.file_name}"),
             rfc822_field('Size', package_file.size),
-            rfc822_field('MD5sum', package_file.file_md5),
             rfc822_field('SHA256', package_file.file_sha256)
           ]
         end
@@ -190,7 +186,6 @@ module Packages
           )
         end
 
-        @md5sum.append(" #{file_md5} #{component_file.size.to_s.rjust(8)} #{component_file.relative_path}")
         @sha256.append(" #{file_sha256} #{component_file.size.to_s.rjust(8)} #{component_file.relative_path}")
       end
 
@@ -234,7 +229,8 @@ module Packages
       end
 
       def release_sums
-        ["MD5Sum:", @md5sum, "SHA256:", @sha256].flatten.compact.join("\n") + "\n"
+        # NB: MD5Sum was removed for FIPS compliance
+        ["SHA256:", @sha256].flatten.compact.join("\n") + "\n"
       end
 
       def rfc822_field(name, value, condition = true)