Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 29 deletions

diff --git a/app/models/packages/debian.rb b/app/models/packages/debian.rb
index f7f7f9f95e9..e20f1b8244a 100644
--- a/app/models/packages/debian.rb
+++ b/app/models/packages/debian.rb
@@ -2,6 +2,10 @@
 
 module Packages
   module Debian
+    DISTRIBUTION_REGEX = %r{[a-z0-9][a-z0-9.-]*}i.freeze
+    COMPONENT_REGEX = DISTRIBUTION_REGEX.freeze
+    ARCHITECTURE_REGEX = %r{[a-z0-9][-a-z0-9]*}.freeze
+
     def self.table_name_prefix
       'packages_debian_'
     end
diff --git a/app/serializers/paginated_diff_entity.rb b/app/serializers/paginated_diff_entity.rb
index 1118b1aa4fe..a2a9e7375a0 100644
--- a/app/serializers/paginated_diff_entity.rb
+++ b/app/serializers/paginated_diff_entity.rb
@@ -23,36 +23,13 @@ class PaginatedDiffEntity < Grape::Entity
   end
 
   expose :pagination do
-    expose :current_page
-    expose :next_page
-    expose :total_pages
-    expose :next_page_href do |diffs|
-      next unless next_page
-
-      project = merge_request.target_project
-
-      diffs_batch_namespace_project_json_merge_request_path(
-        namespace_id: project.namespace.to_param,
-        project_id: project.to_param,
-        id: merge_request.iid,
-        page: next_page,
-        format: :json
-      )
+    expose :total_pages do |diffs, options|
+      options.dig(:pagination_data, :total_pages)
     end
   end
 
   private
 
-  %i[current_page next_page total_pages].each do |method|
-    define_method method do
-      pagination_data[method]
-    end
-  end
-
-  def pagination_data
-    options.fetch(:pagination_data, {})
-  end
-
   def merge_request
     options[:merge_request]
   end
diff --git a/app/services/ci/play_bridge_service.rb b/app/services/ci/play_bridge_service.rb
index 2f0bcece9e3..a719467253e 100644
--- a/app/services/ci/play_bridge_service.rb
+++ b/app/services/ci/play_bridge_service.rb
@@ -9,8 +9,6 @@ module Ci
         bridge.user = current_user
         bridge.enqueue!
 
-        next unless ::Feature.enabled?(:ci_fix_pipeline_status_for_dag_needs_manual, project, default_enabled: :yaml)
-
         AfterRequeueJobService.new(project, current_user).execute(bridge)
       end
     end
diff --git a/app/services/ci/play_build_service.rb b/app/services/ci/play_build_service.rb
index 073c1a2d0e0..c1cf06a4631 100644
--- a/app/services/ci/play_build_service.rb
+++ b/app/services/ci/play_build_service.rb
@@ -11,8 +11,6 @@ module Ci
         build.tap do |build|
           build.update(user: current_user, job_variables_attributes: job_variables_attributes || [])
 
-          next unless ::Feature.enabled?(:ci_fix_pipeline_status_for_dag_needs_manual, project, default_enabled: :yaml)
-
           AfterRequeueJobService.new(project, current_user).execute(build)
         end
       else