From 76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Mar 2020 18:09:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/application_rate_limiter.rb | 2 +- lib/gitlab/middleware/multipart.rb | 18 ++++++++++++------ lib/gitlab/process_memory_cache.rb | 13 +++++++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 lib/gitlab/process_memory_cache.rb (limited to 'lib/gitlab') diff --git a/lib/gitlab/application_rate_limiter.rb b/lib/gitlab/application_rate_limiter.rb index 8468c1c6601..211c59fe841 100644 --- a/lib/gitlab/application_rate_limiter.rb +++ b/lib/gitlab/application_rate_limiter.rb @@ -23,7 +23,7 @@ module Gitlab project_download_export: { threshold: 10, interval: 10.minutes }, project_repositories_archive: { threshold: 5, interval: 1.minute }, project_generate_new_export: { threshold: 1, interval: 5.minutes }, - project_import: { threshold: 30, interval: 10.minutes }, + project_import: { threshold: 30, interval: 5.minutes }, play_pipeline_schedule: { threshold: 1, interval: 1.minute }, show_raw_controller: { threshold: -> { Gitlab::CurrentSettings.current_application_settings.raw_blob_request_limit }, interval: 1.minute } }.freeze diff --git a/lib/gitlab/middleware/multipart.rb b/lib/gitlab/middleware/multipart.rb index 0ee9563c227..cb4213d23a4 100644 --- a/lib/gitlab/middleware/multipart.rb +++ b/lib/gitlab/middleware/multipart.rb @@ -84,12 +84,6 @@ module Gitlab end def open_file(params, key) - allowed_paths = [ - ::FileUploader.root, - Gitlab.config.uploads.storage_path, - File.join(Rails.root, 'public/uploads/tmp') - ] - ::UploadedFile.from_params(params, key, allowed_paths) end @@ -106,6 +100,16 @@ module Gitlab # inside other env keys, here we ensure everything is updated correctly ActionDispatch::Request.new(@request.env).update_param(key, value) end + + private + + def allowed_paths + [ + ::FileUploader.root, + Gitlab.config.uploads.storage_path, + File.join(Rails.root, 'public/uploads/tmp') + ] + end end def initialize(app) @@ -125,3 +129,5 @@ module Gitlab end end end + +::Gitlab::Middleware::Multipart::Handler.prepend_if_ee('EE::Gitlab::Middleware::Multipart::Handler') diff --git a/lib/gitlab/process_memory_cache.rb b/lib/gitlab/process_memory_cache.rb new file mode 100644 index 00000000000..5e8578711b2 --- /dev/null +++ b/lib/gitlab/process_memory_cache.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Gitlab + class ProcessMemoryCache + # ActiveSupport::Cache::MemoryStore is thread-safe: + # https://github.com/rails/rails/blob/2f1fefe456932a6d7d2b155d27b5315c33f3daa1/activesupport/lib/active_support/cache/memory_store.rb#L19 + @cache = ActiveSupport::Cache::MemoryStore.new + + def self.cache_backend + @cache + end + end +end -- cgit v1.2.1