Add latest changes from gitlab-org/gitlab@master

6 files changed, 15 insertions, 14 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index b39444f642f..c32f61c6704 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -80,9 +80,8 @@ module API
       # Temporarily introduced for upload API: https://gitlab.com/gitlab-org/gitlab/-/issues/325788
       def project_attachment_size(user_project)
         return PROJECT_ATTACHMENT_SIZE_EXEMPT if exempt_from_global_attachment_size?(user_project)
-        return user_project.max_attachment_size if Feature.enabled?(:enforce_max_attachment_size_upload_api, user_project)
 
-        PROJECT_ATTACHMENT_SIZE_EXEMPT
+        user_project.max_attachment_size
       end
 
       # This is to help determine which projects to use in https://gitlab.com/gitlab-org/gitlab/-/issues/325788
diff --git a/lib/tasks/gitlab/docs/redirect.rake b/lib/tasks/gitlab/docs/redirect.rake
index 2d234fcdb36..35e0d083210 100644
--- a/lib/tasks/gitlab/docs/redirect.rake
+++ b/lib/tasks/gitlab/docs/redirect.rake
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
-require 'date'
-require 'pathname'
-require "yaml"
 
 #
 # https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page
 #
 namespace :gitlab do
+  require 'date'
+  require 'pathname'
+  require 'yaml'
+
   namespace :docs do
     desc 'GitLab | Docs | Create a doc redirect'
     task :redirect, [:old_path, :new_path] do |_, args|
diff --git a/lib/tasks/gitlab/graphql.rake b/lib/tasks/gitlab/graphql.rake
index a05b749a60e..f54579bd939 100644
--- a/lib/tasks/gitlab/graphql.rake
+++ b/lib/tasks/gitlab/graphql.rake
@@ -2,10 +2,10 @@
 
 return if Rails.env.production?
 
-require 'graphql/rake_task'
-require_relative '../../../tooling/graphql/docs/renderer'
-
 namespace :gitlab do
+  require 'graphql/rake_task'
+  require_relative '../../../tooling/graphql/docs/renderer'
+
   OUTPUT_DIR = Rails.root.join("doc/api/graphql/reference")
   TEMP_SCHEMA_DIR = Rails.root.join('tmp/tests/graphql')
   TEMPLATES_DIR = 'tooling/graphql/docs/templates/'
diff --git a/lib/tasks/gitlab/lfs/migrate.rake b/lib/tasks/gitlab/lfs/migrate.rake
index 47f9e1dfb32..19de45dca17 100644
--- a/lib/tasks/gitlab/lfs/migrate.rake
+++ b/lib/tasks/gitlab/lfs/migrate.rake
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'logger'
-
 desc "GitLab | LFS | Migrate LFS objects to remote storage"
 namespace :gitlab do
+  require 'logger'
+
   namespace :lfs do
     task migrate: :environment do
       logger = Logger.new($stdout)
diff --git a/lib/tasks/gitlab/metrics_exporter.rake b/lib/tasks/gitlab/metrics_exporter.rake
index d9dd80b8eeb..70719648fc5 100644
--- a/lib/tasks/gitlab/metrics_exporter.rake
+++ b/lib/tasks/gitlab/metrics_exporter.rake
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require_relative Rails.root.join('metrics_server', 'dependencies')
-require_relative Rails.root.join('metrics_server', 'metrics_server')
 
 namespace :gitlab do
+  require_relative Rails.root.join('metrics_server', 'dependencies')
+  require_relative Rails.root.join('metrics_server', 'metrics_server')
+
   namespace :metrics_exporter do
     REPO = 'https://gitlab.com/gitlab-org/gitlab-metrics-exporter.git'
 
diff --git a/lib/tasks/gitlab/openapi.rake b/lib/tasks/gitlab/openapi.rake
index dee365de11c..c9aec6a112a 100644
--- a/lib/tasks/gitlab/openapi.rake
+++ b/lib/tasks/gitlab/openapi.rake
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'logger'
-
 if Rails.env.development?
   require 'grape-swagger/rake/oapi_tasks'
   GrapeSwagger::Rake::OapiTasks.new('::API::API')
 end
 
 namespace :gitlab do
+  require 'logger'
+
   namespace :openapi do
     task :validate do
       raise 'This task can only be run in the development environment' unless Rails.env.development?