Automatic merge of gitlab-org/gitlab-ce master

doc/development/README.md

@@ -65,6 +65,7 @@ description: 'Learn how to contribute to GitLab.'
 - [Repository mirroring](repository_mirroring.md)
 - [Git LFS](lfs.md)
 - [Developing against interacting components or features](interacting_components.md)
+- [File uploads](uploads.md)
 
 ## Performance guides
 

doc/development/file_storage.md

@@ -2,6 +2,8 @@
 
 We use the [CarrierWave] gem to handle file upload, store and retrieval.
 
+File uploads should be accelerated by workhorse, for details please refer to [uploads development documentation](uploads.md).
+
 There are many places where file uploading is used, according to contexts:
 
 - System

lib/gitlab/profiler.rb

@@ -97,7 +97,7 @@ module Gitlab
           attr_reader :load_times_by_model, :private_token
 
           def debug(message, *)
-            message.gsub!(private_token, FILTERED_STRING) if private_token
+            message = message.gsub(private_token, FILTERED_STRING) if private_token
 
             _, type, time = *message.match(/(\w+) Load \(([0-9.]+)ms\)/)
 

lib/gitlab/quick_actions/substitution_definition.rb

@@ -17,8 +17,9 @@ module Gitlab
         return unless content
 
         all_names.each do |a_name|
-          content.gsub!(%r{/#{a_name} ?(.*)$}i, execute_block(action_block, context, '\1'))
+          content = content.gsub(%r{/#{a_name} ?(.*)$}i, execute_block(action_block, context, '\1'))
         end
+
         content
       end
     end

spec/lib/gitlab/legacy_github_import/release_formatter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::LegacyGithubImport::ReleaseFormatter do

spec/lib/gitlab/legacy_github_import/user_formatter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::LegacyGithubImport::UserFormatter do

spec/lib/gitlab/legacy_github_import/wiki_formatter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::LegacyGithubImport::WikiFormatter do

spec/lib/gitlab/loop_helpers_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::LoopHelpers do

spec/lib/gitlab/manifest_import/manifest_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ManifestImport::Manifest do

spec/lib/gitlab/manifest_import/project_creator_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ManifestImport::ProjectCreator do

spec/lib/gitlab/markup_helper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::MarkupHelper do

spec/lib/gitlab/metrics/background_transaction_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::BackgroundTransaction do

spec/lib/gitlab/metrics/delta_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Delta do

spec/lib/gitlab/metrics/instrumentation_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Instrumentation do

spec/lib/gitlab/metrics/method_call_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::MethodCall do

spec/lib/gitlab/metrics/methods_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Methods do

spec/lib/gitlab/metrics/metric_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Metric do

spec/lib/gitlab/metrics/prometheus_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Prometheus, :prometheus do

spec/lib/gitlab/metrics/rack_middleware_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::RackMiddleware do

spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::RequestsRackMiddleware do

spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::InfluxSampler do

spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::RubySampler do

spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::UnicornSampler do

spec/lib/gitlab/metrics/sidekiq_metrics_exporter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::SidekiqMetricsExporter do

spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::SidekiqMiddleware do

spec/lib/gitlab/metrics/subscribers/action_view_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::ActionView do

spec/lib/gitlab/metrics/subscribers/active_record_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::ActiveRecord do

spec/lib/gitlab/metrics/subscribers/rails_cache_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::Subscribers::RailsCache do

spec/lib/gitlab/metrics/system_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::System do

spec/lib/gitlab/metrics/web_transaction_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics::WebTransaction do

spec/lib/gitlab/metrics_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Metrics do

spec/lib/gitlab/middleware/basic_health_check_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Middleware::BasicHealthCheck do

spec/lib/gitlab/middleware/multipart_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'tempfile'

spec/lib/gitlab/middleware/rails_queue_duration_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Middleware::RailsQueueDuration do

spec/lib/gitlab/middleware/read_only_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Middleware::ReadOnly do

spec/lib/gitlab/middleware/release_env_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Middleware::ReleaseEnv do

spec/lib/gitlab/multi_collection_paginator_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::MultiCollectionPaginator do

spec/lib/gitlab/object_hierarchy_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ObjectHierarchy do

spec/lib/gitlab/octokit/middleware_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Octokit::Middleware do

spec/lib/gitlab/omniauth_initializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::OmniauthInitializer do

spec/lib/gitlab/optimistic_locking_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::OptimisticLocking do

spec/lib/gitlab/other_markup_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::OtherMarkup do

spec/lib/gitlab/otp_key_rotator_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::OtpKeyRotator do

spec/lib/gitlab/pages_client_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PagesClient do

spec/lib/gitlab/path_regex_spec.rb

 # coding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PathRegex do

spec/lib/gitlab/performance_bar_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PerformanceBar do

spec/lib/gitlab/phabricator_import/importer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PhabricatorImport::Importer do

spec/lib/gitlab/phabricator_import/user_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PhabricatorImport::UserFinder, :clean_gitlab_redis_cache do

spec/lib/gitlab/phabricator_import/worker_state_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PhabricatorImport::WorkerState, :clean_gitlab_redis_shared_state do

spec/lib/gitlab/plugin_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Plugin do

spec/lib/gitlab/polling_interval_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PollingInterval do

spec/lib/gitlab/popen/runner_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Popen::Runner do

spec/lib/gitlab/popen_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Popen do

spec/lib/gitlab/profiler_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Profiler do

spec/lib/gitlab/project_authorizations_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ProjectAuthorizations do

spec/lib/gitlab/project_search_results_spec.rb

 # coding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ProjectSearchResults do

spec/lib/gitlab/project_template_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ProjectTemplate do

spec/lib/gitlab/project_transfer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ProjectTransfer do

spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Prometheus::AdditionalMetricsParser do

spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery do

spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery do

spec/lib/gitlab/prometheus/queries/deployment_query_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::DeploymentQuery do

spec/lib/gitlab/prometheus/queries/matched_metric_query_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::MatchedMetricQuery do

spec/lib/gitlab/prometheus_client_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::PrometheusClient do

spec/lib/gitlab/query_limiting/active_support_subscriber_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QueryLimiting::ActiveSupportSubscriber do

spec/lib/gitlab/query_limiting/middleware_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QueryLimiting::Middleware do

spec/lib/gitlab/query_limiting/transaction_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QueryLimiting::Transaction do

spec/lib/gitlab/query_limiting_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QueryLimiting do

spec/lib/gitlab/quick_actions/command_definition_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QuickActions::CommandDefinition do

spec/lib/gitlab/quick_actions/dsl_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QuickActions::Dsl do

spec/lib/gitlab/quick_actions/extractor_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QuickActions::Extractor do

spec/lib/gitlab/quick_actions/spend_time_and_date_separator_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QuickActions::SpendTimeAndDateSeparator do

spec/lib/gitlab/quick_actions/substitution_definition_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::QuickActions::SubstitutionDefinition do

spec/lib/gitlab/redis/cache_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Redis::Cache do

spec/lib/gitlab/redis/queues_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Redis::Queues do

spec/lib/gitlab/redis/shared_state_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Redis::SharedState do

spec/lib/gitlab/redis/wrapper_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Redis::Wrapper do

spec/lib/gitlab/reference_counter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ReferenceCounter do

spec/lib/gitlab/regex_spec.rb

 # coding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Regex do

spec/lib/gitlab/repo_path_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ::Gitlab::RepoPath do

spec/lib/gitlab/repository_cache_adapter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RepositoryCacheAdapter do

spec/lib/gitlab/repository_cache_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RepositoryCache do

spec/lib/gitlab/repository_set_cache_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RepositorySetCache, :clean_gitlab_redis_cache do

spec/lib/gitlab/request_context_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RequestContext do

spec/lib/gitlab/request_forgery_protection_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RequestForgeryProtection, :allow_forgery_protection do

spec/lib/gitlab/request_profiler/profile_spec.rb

+# frozen_string_literal: true
+
 require 'fast_spec_helper'
 
 describe Gitlab::RequestProfiler::Profile do

spec/lib/gitlab/request_profiler_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RequestProfiler do

spec/lib/gitlab/route_map_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::RouteMap do

spec/lib/gitlab/routing_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Routing do

spec/lib/gitlab/sanitizers/exif_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Sanitizers::Exif do

spec/lib/gitlab/sanitizers/svg_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Sanitizers::SVG do

spec/lib/gitlab/search/found_blob_spec.rb

 # coding: utf-8
+# frozen_string_literal: true
 
 require 'spec_helper'
 
@@ -108,7 +109,7 @@ describe Gitlab::Search::FoundBlob do
       end
 
       context 'with ISO-8859-1' do
-        let(:search_result) { "master:encoding/iso8859.txt\x001\x00\xC4\xFC\nmaster:encoding/iso8859.txt\x002\x00\nmaster:encoding/iso8859.txt\x003\x00foo\n".force_encoding(Encoding::ASCII_8BIT) }
+        let(:search_result) { (+"master:encoding/iso8859.txt\x001\x00\xC4\xFC\nmaster:encoding/iso8859.txt\x002\x00\nmaster:encoding/iso8859.txt\x003\x00foo\n").force_encoding(Encoding::ASCII_8BIT) }
 
         it 'returns results as UTF-8' do
           expect(subject.filename).to eq('encoding/iso8859.txt')

spec/lib/gitlab/search/query_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Search::Query do

spec/lib/gitlab/search_results_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::SearchResults do

spec/lib/gitlab/sentry_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Sentry do

spec/lib/gitlab/serializer/ci/variables_spec.rb

+# frozen_string_literal: true
+
 require 'fast_spec_helper'
 
 describe Gitlab::Serializer::Ci::Variables do

spec/lib/gitlab/serializer/pagination_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::Serializer::Pagination do

spec/lib/gitlab/shard_health_cache_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Gitlab::ShardHealthCache, :clean_gitlab_redis_cache do

spec/lib/gitlab/shell_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'stringio'