Merge branch 'rs-config-parity-ee' into 'master'

Finish up config CE-EE parity

Closes #4946

See merge request gitlab-org/gitlab-ee!14733

config/initializers/mysql_set_length_for_binary_indexes.rb

-# This patches ActiveRecord so indexes for binary columns created
-# using the MySQL adapter apply a length of 20. Otherwise MySQL can't create an
-# index on binary columns.
+# This patches ActiveRecord so indexes for binary columns created using the
+# MySQL adapter apply a length of 20. Otherwise MySQL can't create an index on
+# binary columns.
 
 module MysqlSetLengthForBinaryIndexAndIgnorePostgresOptionsForSchema
   # This method is used in Rails 5 schema loading as t.index

config/initializers/rack_attack_global.rb

@@ -43,8 +43,6 @@ class Rack::Attack
   end
 
   class Request
-    prepend ::EE::Gitlab::Rack::Attack::Request # rubocop: disable Cop/InjectEnterpriseEditionModule
-
     def unauthenticated?
       !authenticated_user_id([:api, :rss, :ics])
     end
@@ -70,3 +68,5 @@ class Rack::Attack
     end
   end
 end
+
+::Rack::Attack::Request.prepend(::EE::Gitlab::Rack::Attack::Request)

config/unicorn.rb.example

@@ -137,4 +137,3 @@ after_fork do |server, worker|
   # addr = "127.0.0.1:#{9293 + worker.nr}"
   # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
 end
-