Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 4 deletions

diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 642cffa6c0d..aaed01403cb 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -262,8 +262,6 @@ module MergeRequests
         assignees_service.execute(merge_request)
       when :spend_time
         add_time_spent_service.execute(merge_request)
-      else
-        nil
       end
     end
 
diff --git a/app/services/packages/debian/generate_distribution_service.rb b/app/services/packages/debian/generate_distribution_service.rb
index 0740da6c07e..d69f6eb1511 100644
--- a/app/services/packages/debian/generate_distribution_service.rb
+++ b/app/services/packages/debian/generate_distribution_service.rb
@@ -163,7 +163,6 @@ module Packages
       end
 
       def reuse_or_create_component_file(component, component_file_type, architecture, content)
-        file_md5 = Digest::MD5.hexdigest(content)
         file_sha256 = Digest::SHA256.hexdigest(content)
         component_files = component.files
                                    .with_file_type(component_file_type)
@@ -194,7 +193,6 @@ module Packages
             architecture: architecture,
             compression_type: nil,
             file: CarrierWaveStringFile.new(content),
-            file_md5: file_md5,
             file_sha256: file_sha256,
             size: content.bytesize
           )