Add latest changes from gitlab-org/gitlab@master

doc/administration/configure.md

@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Configure your GitLab installation
+# Configure your GitLab installation **(FREE SELF)**
 
 Customize and configure your self-managed GitLab installation.
 

doc/administration/operations/cleaning_up_redis_sessions.md

@@ -4,7 +4,7 @@ group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Cleaning up stale Redis sessions
+# Cleaning up stale Redis sessions **(FREE SELF)**
 
 Since version 6.2, GitLab stores web user sessions as key-value pairs in Redis.
 Prior to GitLab 7.3, user sessions did not automatically expire from Redis. If

doc/install/aws/gitlab_hybrid_on_aws.md

@@ -57,10 +57,12 @@ A set of performance testing instructions have been abbreviated for testing a Gi
 The AWS Quick Start for GitLab Cloud Native Hybrid on EKS has been tested with GovCloud and works with the following restrictions and understandings.
 
 - GovCloud does not have public Route53 hosted zones, so you must set the following parameters:
-    | CloudFormation Quick Start form field               | CloudFormation Parameter | Setting |
-    | --------------------------------------------------- | ------------------------ | ------- |
-    | **Create Route 53 hosted zone**                     | CreatedHostedZone        | No      |
-    | **Request AWS Certificate Manager SSL certificate** | CreateSslCertificate     | No      |
+
+  | CloudFormation Quick Start form field               | CloudFormation Parameter | Setting |
+  | --------------------------------------------------- | ------------------------ | ------- |
+  | **Create Route 53 hosted zone**                     | CreatedHostedZone        | No      |
+  | **Request AWS Certificate Manager SSL certificate** | CreateSslCertificate     | No      |
+
 - The Quick Start creates public load balancer IPs, so that you can easily configure your local hosts file to get to the GUI for GitLab when deploying tests. However, you may need to manually alter this if public load balancers are not part of your provisioning plan. We are planning to make non-public load balancers a configuration option issue link: [Short Term: Documentation and/or Automation for private GitLab instance with no internet Ingress](https://github.com/aws-quickstart/quickstart-eks-gitlab/issues/55)
 - As of 2021-08-19, AWS GovCloud has Graviton instances for Aurora PostgreSQL available, but does not for ElastiCache Redis.
 - It is challenging to get the Quick Start template to load in GovCloud from the Standard Quick Start URL, so the generic ones are provided here:

doc/install/docker.md

@@ -621,7 +621,7 @@ variety of statistics on the health and performance of GitLab. The files
 required for this gets written to a temporary file system (like `/run` or
 `/dev/shm`).
 
-By default, Docker allocates 64Mb to the shared memory directory (mounted at
+By default, Docker allocates 64MB to the shared memory directory (mounted at
 `/dev/shm`). This is insufficient to hold all the Prometheus metrics related
 files generated, and will generate error logs like the following:
 
@@ -636,7 +636,7 @@ writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with un
 ```
 
 Other than disabling the Prometheus Metrics from the Admin page, the recommended
-solution to fix this problem is to increase the size of shm to at least 256Mb.
+solution to fix this problem is to increase the size of shared memory to at least 256MB.
 If using `docker run`, this can be done by passing the flag `--shm-size 256m`.
 If using a `docker-compose.yml` file, the `shm_size` key can be used for this
 purpose.

doc/install/next_steps.md

@@ -4,7 +4,7 @@ group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Steps after installing GitLab
+# Steps after installing GitLab **(FREE SELF)**
 
 Here are a few resources you might want to check out after completing the
 installation.

doc/topics/offline/index.md

@@ -4,7 +4,7 @@ group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Offline GitLab
+# Offline GitLab **(FREE SELF)**
 
 Computers in an offline environment are isolated from the public internet as a security measure. This
 page lists all the information available for running GitLab in an offline environment.

doc/topics/offline/quick_start_guide.md

@@ -4,7 +4,7 @@ group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Getting started with an offline GitLab Installation
+# Getting started with an offline GitLab Installation **(FREE SELF)**
 
 This is a step-by-step guide that helps you install, configure, and use a self-managed GitLab
 instance entirely offline.

doc/user/project/issue_board.md

@@ -387,7 +387,7 @@ appears on the right. There you can see and edit the issue's:
 
 - Title
 - Assignees
-- Epic **PREMIUM**
+- Epic **(PREMIUM)**
 - Milestone
 - Time tracking value (view only)
 - Due date

lib/gitlab/database/connection.rb

@@ -174,8 +174,11 @@ module Gitlab
       end
 
       def exists?
-        connection
-
+        # We can't _just_ check if `connection` raises an error, as it will
+        # point to a `ConnectionProxy`, and obtaining those doesn't involve any
+        # database queries. So instead we obtain the database version, which is
+        # cached after the first call.
+        connection.schema_cache.database_version
         true
       rescue StandardError
         false

spec/lib/gitlab/database/connection_spec.rb

@@ -393,34 +393,28 @@ RSpec.describe Gitlab::Database::Connection do
   end
 
   describe '#cached_column_exists?' do
-    it 'only retrieves data once' do
-      expect(connection.scope.connection)
-        .to receive(:columns)
-        .once.and_call_original
-
-      2.times do
-        expect(connection.cached_column_exists?(:projects, :id)).to be_truthy
-        expect(connection.cached_column_exists?(:projects, :bogus_column)).to be_falsey
+    it 'only retrieves the data from the schema cache' do
+      queries = ActiveRecord::QueryRecorder.new do
+        2.times do
+          expect(connection.cached_column_exists?(:projects, :id)).to be_truthy
+          expect(connection.cached_column_exists?(:projects, :bogus_column)).to be_falsey
+        end
       end
+
+      expect(queries.count).to eq(0)
     end
   end
 
   describe '#cached_table_exists?' do
-    it 'only retrieves data once per table' do
-      expect(connection.scope.connection)
-        .to receive(:data_source_exists?)
-        .with(:projects)
-        .once.and_call_original
-
-      expect(connection.scope.connection)
-        .to receive(:data_source_exists?)
-        .with(:bogus_table_name)
-        .once.and_call_original
-
-      2.times do
-        expect(connection.cached_table_exists?(:projects)).to be_truthy
-        expect(connection.cached_table_exists?(:bogus_table_name)).to be_falsey
+    it 'only retrieves the data from the schema cache' do
+      queries = ActiveRecord::QueryRecorder.new do
+        2.times do
+          expect(connection.cached_table_exists?(:projects)).to be_truthy
+          expect(connection.cached_table_exists?(:bogus_table_name)).to be_falsey
+        end
       end
+
+      expect(queries.count).to eq(0)
     end
 
     it 'returns false when database does not exist' do
@@ -433,16 +427,14 @@ RSpec.describe Gitlab::Database::Connection do
   end
 
   describe '#exists?' do
-    it 'returns true if `ActiveRecord::Base.connection` succeeds' do
-      expect(connection.scope).to receive(:connection)
-
+    it 'returns true if the database exists' do
       expect(connection.exists?).to be(true)
     end
 
-    it 'returns false if `ActiveRecord::Base.connection` fails' do
-      expect(connection.scope).to receive(:connection) do
-        raise ActiveRecord::NoDatabaseError, 'broken'
-      end
+    it "returns false if the database doesn't exist" do
+      expect(connection.scope.connection.schema_cache)
+        .to receive(:database_version)
+        .and_raise(ActiveRecord::NoDatabaseError)
 
       expect(connection.exists?).to be(false)
     end