Add latest changes from gitlab-org/gitlab@master

10 files changed, 21 insertions, 14 deletions

diff --git a/config/application.rb b/config/application.rb
index 304cd72e806..e8cc35aed2a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,7 +1,9 @@
 require_relative 'boot'
 
-# Based on https://github.com/rails/rails/blob/v5.2.3/railties/lib/rails/all.rb
+# Based on https://github.com/rails/rails/blob/v6.0.1/railties/lib/rails/all.rb
 # Only load the railties we need instead of loading everything
+require 'rails'
+
 require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_view/railtie'
diff --git a/config/environment.rb b/config/environment.rb
index 7e55c7803d3..426333bb469 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,6 +1,5 @@
-# Load the rails application
-
+# Load the Rails application.
 require_relative 'application'
 
-# Initialize the rails application
+# Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index dc804197fef..960892a1dc2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -50,4 +50,8 @@ Rails.application.configure do
 
   # BetterErrors live shell (REPL) on every stack frame
   BetterErrors::Middleware.allow_ip!("127.0.0.1/0")
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end
diff --git a/config/initializers/active_record_data_types.rb b/config/initializers/active_record_data_types.rb
index 2b3f58330e3..3fa999e9908 100644
--- a/config/initializers/active_record_data_types.rb
+++ b/config/initializers/active_record_data_types.rb
@@ -24,10 +24,11 @@ module RegisterDateTimeWithTimeZone
   def initialize_type_map(mapping = type_map)
     super mapping
 
-    mapping.register_type 'timestamptz' do |_, _, sql_type|
-      precision = extract_precision(sql_type)
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::DateTimeWithTimeZone.new(precision: precision)
-    end
+    register_class_with_precision(
+      mapping,
+      'timestamptz',
+      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::DateTimeWithTimeZone
+    )
   end
 end
 
@@ -46,3 +47,5 @@ end
 if (ActiveRecord::Base.connection.active? rescue false)
   ActiveRecord::Base.connection.send :reload_type_map
 end
+
+ActiveRecord::Base.time_zone_aware_types += [:datetime_with_timezone]
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index a293909149e..d585ecda307 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -6,7 +6,7 @@ module ActiveRecord
           self
         end
 
-        def self.run(preloader)
+        def self.run
         end
 
         def self.preloaded_records
diff --git a/config/initializers/active_record_query_cache.rb b/config/initializers/active_record_query_cache.rb
deleted file mode 100644
index 61505a1edd3..00000000000
--- a/config/initializers/active_record_query_cache.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-ActiveRecord::ConnectionAdapters::ConnectionPool.prepend Gitlab::Patch::ActiveRecordQueryCache
diff --git a/config/initializers/config_initializers_active_record_locking.rb b/config/initializers/config_initializers_active_record_locking.rb
index 915247826e9..9f9908283c6 100644
--- a/config/initializers/config_initializers_active_record_locking.rb
+++ b/config/initializers/config_initializers_active_record_locking.rb
@@ -26,7 +26,7 @@ module ActiveRecord
             locking_column => possible_previous_lock_value,
             self.class.primary_key => id_in_database
           ).update_all(
-            attributes_with_values_for_update(attribute_names)
+            attributes_with_values(attribute_names)
           )
 
           if affected_rows != 1
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 608d0401a96..c19fb65017f 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -12,4 +12,5 @@ if csp_settings['enabled']
 
   Rails.application.config.content_security_policy_report_only = csp_settings['report_only']
   Rails.application.config.content_security_policy_nonce_generator = ->(request) { SecureRandom.base64(16) }
+  Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
 end
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 54516e3f23d..a04d5044f4e 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,4 @@
 # Be sure to restart your server when you modify this file.
 
+Rails.application.config.action_dispatch.use_cookies_with_metadata = false
 Rails.application.config.action_dispatch.cookies_serializer = :hybrid
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 68568db1326..352184ed746 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -166,7 +166,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :releases, only: [:index, :edit], param: :tag, constraints: { tag: %r{[^/]+} } do
+        resources :releases, only: [:index, :show, :edit], param: :tag, constraints: { tag: %r{[^/]+} } do
           member do
             get :evidence
           end