From afcacea9362b7990b80696c2e63c2a9100f92ab5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 2 Apr 2021 09:09:02 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../admin/users/components/users_table.vue    |  2 +-
 .../javascripts/admin/users/constants.js      |  2 -
 .../components/user_date.vue                  |  0
 .../javascripts/vue_shared/constants.js       |  2 +
 doc/administration/nfs.md                     |  2 +-
 doc/ci/docker/using_docker_build.md           |  1 -
 doc/ci/environments/protected_environments.md |  4 +-
 doc/install/aws/index.md                      |  5 +-
 doc/install/installation.md                   |  2 +-
 doc/raketasks/index.md                        | 73 ++++++++++---------
 doc/update/upgrading_from_source.md           |  2 +-
 locale/gitlab.pot                             |  9 +++
 .../admin/users/components/user_date_spec.js  |  2 +-
 .../users/components/users_table_spec.js      |  2 +-
 14 files changed, 60 insertions(+), 48 deletions(-)
 rename app/assets/javascripts/{admin/users => vue_shared}/components/user_date.vue (100%)

diff --git a/app/assets/javascripts/admin/users/components/users_table.vue b/app/assets/javascripts/admin/users/components/users_table.vue
index 8962068601c..8b41a063abc 100644
--- a/app/assets/javascripts/admin/users/components/users_table.vue
+++ b/app/assets/javascripts/admin/users/components/users_table.vue
@@ -1,9 +1,9 @@
 <script>
 import { GlTable } from '@gitlab/ui';
 import { __ } from '~/locale';
+import UserDate from '~/vue_shared/components/user_date.vue';
 import UserActions from './user_actions.vue';
 import UserAvatar from './user_avatar.vue';
-import UserDate from './user_date.vue';
 
 const DEFAULT_TH_CLASSES =
   'gl-bg-transparent! gl-border-b-solid! gl-border-b-gray-100! gl-p-5! gl-border-b-1!';
diff --git a/app/assets/javascripts/admin/users/constants.js b/app/assets/javascripts/admin/users/constants.js
index 8ea1bd3ca7a..c55edefe607 100644
--- a/app/assets/javascripts/admin/users/constants.js
+++ b/app/assets/javascripts/admin/users/constants.js
@@ -2,8 +2,6 @@ import { s__, __ } from '~/locale';
 
 export const USER_AVATAR_SIZE = 32;
 
-export const SHORT_DATE_FORMAT = 'd mmm, yyyy';
-
 export const LENGTH_OF_USER_NOTE_TOOLTIP = 100;
 
 export const I18N_USER_ACTIONS = {
diff --git a/app/assets/javascripts/admin/users/components/user_date.vue b/app/assets/javascripts/vue_shared/components/user_date.vue
similarity index 100%
rename from app/assets/javascripts/admin/users/components/user_date.vue
rename to app/assets/javascripts/vue_shared/components/user_date.vue
diff --git a/app/assets/javascripts/vue_shared/constants.js b/app/assets/javascripts/vue_shared/constants.js
index 5262a15136b..9a5ad195de9 100644
--- a/app/assets/javascripts/vue_shared/constants.js
+++ b/app/assets/javascripts/vue_shared/constants.js
@@ -8,6 +8,8 @@ const INTERVALS = {
 
 export const FILE_SYMLINK_MODE = '120000';
 
+export const SHORT_DATE_FORMAT = 'd mmm, yyyy';
+
 export const timeRanges = [
   {
     label: __('30 minutes'),
diff --git a/doc/administration/nfs.md b/doc/administration/nfs.md
index d04a86ab4c6..4b098f5ddbf 100644
--- a/doc/administration/nfs.md
+++ b/doc/administration/nfs.md
@@ -241,7 +241,7 @@ From the [Linux man page](https://linux.die.net/man/5/nfs), the important parts:
 >
 > Using the nocto option may improve performance for read-only mounts, but should be used only if the data on the server changes only occasionally.
 
-We have noticed this behavior in an issue about [refs not found after a push](https://gitlab.com/gitlab-org/gitaly/-/issues/2589),
+We have noticed this behavior in an issue about [refs not found after a push](https://gitlab.com/gitlab-org/gitlab/-/issues/326066),
 where newly added loose refs can be seen as missing on a different client with a local dentry cache, as
 [described in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/326066#note_539436931).
 
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index a2779e43115..90a33478239 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -105,7 +105,6 @@ not without its own challenges:
 - **The `docker-compose` command**: This command is not available in this configuration by default.
   To use `docker-compose` in your job scripts, follow the `docker-compose`
   [installation instructions](https://docs.docker.com/compose/install/).
-  You can view a sample project that uses this approach here: <https://gitlab.com/gitlab-examples/docker>.
 - **Cache**: Each job runs in a new environment. Concurrent jobs work fine,
   because every build gets its own instance of Docker engine and they don't conflict with each other.
   However, jobs can be slower because there's no caching of layers.
diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md
index 9a639fde5f6..df0bb2817ab 100644
--- a/doc/ci/environments/protected_environments.md
+++ b/doc/ci/environments/protected_environments.md
@@ -66,8 +66,8 @@ Alternatively, you can use the API to protect an environment:
      when: manual
      script:
        - 'echo "Deploying to ${CI_ENVIRONMENT_NAME}"'
-   environment:
-     name: ${CI_JOB_NAME}
+     environment:
+       name: ${CI_JOB_NAME}
    ```
 
 1. Use the UI to [create a new group](../../user/group/index.md#create-a-group).
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 2e9115f3c5b..44b177b9765 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -654,8 +654,9 @@ That concludes the configuration changes for our GitLab instance. Next, we'll cr
 
 ### Log in for the first time
 
-Using the domain name you used when setting up [DNS for the load balancer](#configure-dns-for-load-balancer), you should now be able to visit GitLab in your browser. You will be asked to set up a password
-for the `root` user which has admin privileges on the GitLab instance. This password will be stored in the database.
+Using the domain name you used when setting up [DNS for the load balancer](#configure-dns-for-load-balancer), you should now be able to visit GitLab in your browser.
+If you didn't change the password by any other means, the default password will be the same as the instance ID. To change the default password, login as the `root` user
+with the default password and [change it in the user profile](../../user/profile#change-your-password).
 
 When our [auto scaling group](#create-an-auto-scaling-group) spins up new instances, we'll be able to log in with username `root` and the newly created password.
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index f19c61c6191..b9eb20f7633 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -212,7 +212,7 @@ curl --remote-name --progress-bar "https://cache.ruby-lang.org/pub/ruby/2.7/ruby
 echo 'cb9731a17487e0ad84037490a6baf8bfa31a09e8  ruby-2.7.2.tar.gz' | shasum -c - && tar xzf ruby-2.7.2.tar.gz
 cd ruby-2.7.2
 
-./configure --disable-install-rdoc
+./configure --disable-install-rdoc --enable-shared
 make
 sudo make install
 ```
diff --git a/doc/raketasks/index.md b/doc/raketasks/index.md
index ab0505f065e..7efe3115a83 100644
--- a/doc/raketasks/index.md
+++ b/doc/raketasks/index.md
@@ -1,48 +1,51 @@
 ---
-stage: none
-group: unassigned
+stage: Enablement
+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
 comments: false
 ---
 
 # Rake tasks **(FREE SELF)**
 
-GitLab provides [Rake](https://ruby.github.io/rake/) tasks for common administration and operational processes.
+GitLab provides [Rake](https://ruby.github.io/rake/) tasks to assist you with
+common administration and operational processes.
 
-GitLab Rake tasks are performed using:
+You can perform GitLab Rake tasks by using:
 
-- `gitlab-rake <raketask>` for [Omnibus GitLab](https://docs.gitlab.com/omnibus/README.html) installations.
-- `bundle exec rake <raketask>` for [source](../install/installation.md) installations.
+- `gitlab-rake <raketask>` for [Omnibus GitLab](https://docs.gitlab.com/omnibus/README.html)
+  installations.
+- `bundle exec rake <raketask>` for [source](../install/installation.md)
+  installations.
 
 ## Available Rake tasks
 
-The following are available Rake tasks:
+The following Rake tasks are available for use with GitLab:
 
-| Tasks                                                                                               | Description                                                                               |
-|:----------------------------------------------------------------------------------------------------|:------------------------------------------------------------------------------------------|
-| [Back up and restore](backup_restore.md)                                                            | Back up, restore, and migrate GitLab instances between servers.                           |
-| [Clean up](cleanup.md)                                                                              | Clean up unneeded items from GitLab instances.                                            |
-| [Development](../development/rake_tasks.md)                                                         | Tasks for GitLab contributors.                                                            |
-| [Doctor tasks](../administration/raketasks/doctor.md)                                               | Checks for data integrity issues.                                                         |
-| [Elasticsearch](../integration/elasticsearch.md#gitlab-advanced-search-rake-tasks) **(PREMIUM SELF)** | Maintain Elasticsearch in a GitLab instance.                                              |
-| [Enable namespaces](features.md)                                                                    | Enable usernames and namespaces for user projects.                                        |
-| [General maintenance](../administration/raketasks/maintenance.md)                                   | General maintenance and self-check tasks.                                                 |
-| [Geo maintenance](../administration/raketasks/geo.md) **(PREMIUM SELF)**                            | [Geo](../administration/geo/index.md)-related maintenance.                    |
-| [GitHub import](../administration/raketasks/github_import.md)                                       | Retrieve and import repositories from GitHub.                                             |
-| [Import repositories](import.md)                                                                    | Import bare repositories into your GitLab instance.                                       |
-| [Import large project exports](../development/import_project.md#importing-via-a-rake-task)          | Import large GitLab [project exports](../user/project/settings/import_export.md).         |
-| [Integrity checks](../administration/raketasks/check.md)                                            | Check the integrity of repositories, files, and LDAP.                                     |
-| [LDAP maintenance](../administration/raketasks/ldap.md)                                             | [LDAP](../administration/auth/ldap/index.md)-related tasks.                               |
-| [List repositories](list_repos.md)                                                                  | List of all GitLab-managed Git repositories on disk.                                      |
-| [Migrate Snippets to Git](migrate_snippets.md)                                                      | Migrate GitLab Snippets to Git repositories and show migration status                     |
-| [Praefect Rake tasks](../administration/raketasks/praefect.md)                                      | [Praefect](../administration/gitaly/praefect.md)-related tasks.                           |
-| [Project import/export](../administration/raketasks/project_import_export.md)                       | Prepare for [project exports and imports](../user/project/settings/import_export.md).     |
-| [Sample Prometheus data](generate_sample_prometheus_data.md)                                        | Generate sample Prometheus data.                                                          |
-| [SPDX license list import](spdx.md) **(PREMIUM SELF)**                                              | Import a local copy of the [SPDX license list](https://spdx.org/licenses/) for matching [License Compliance policies](../user/compliance/license_compliance/index.md).|                                                     |
-| [Repository storage](../administration/raketasks/storage.md)                                        | List and migrate existing projects and attachments from legacy storage to hashed storage. |
-| [Uploads migrate](../administration/raketasks/uploads/migrate.md)                                   | Migrate uploads between storage local and object storage.                                 |
-| [Uploads sanitize](../administration/raketasks/uploads/sanitize.md)                                 | Remove EXIF data from images uploaded to earlier versions of GitLab.                      |
-| [Usage data](../administration/troubleshooting/gitlab_rails_cheat_sheet.md#generate-usage-ping)     | Generate and troubleshoot [Usage Ping](../development/usage_ping/index.md).|
-| [User management](user_management.md)                                                               | Perform user management tasks.                                                            |
-| [Webhooks administration](web_hooks.md)                                                             | Maintain project Webhooks.                                                                |
-| [X.509 signatures](x509_signatures.md)                                                              | Update X.509 commit signatures, useful if certificate store has changed.                  |
+| Tasks                                                 | Description |
+|:------------------------------------------------------|:------------|
+| [Back up and restore](backup_restore.md)              | Back up, restore, and migrate GitLab instances between servers. |
+| [Clean up](cleanup.md)                                | Clean up unneeded items from GitLab instances. |
+| [Development](../development/rake_tasks.md)           | Tasks for GitLab contributors. |
+| [Doctor tasks](../administration/raketasks/doctor.md) | Checks for data integrity issues. |
+| [Elasticsearch](../integration/elasticsearch.md#gitlab-advanced-search-rake-tasks) | Maintain Elasticsearch in a GitLab instance. |
+| [Enable namespaces](features.md)                      | Enable usernames and namespaces for user projects. |
+| [General maintenance](../administration/raketasks/maintenance.md) | General maintenance and self-check tasks. |
+| [Geo maintenance](../administration/raketasks/geo.md) | [Geo](../administration/geo/index.md)-related maintenance. |
+| [GitHub import](../administration/raketasks/github_import.md) | Retrieve and import repositories from GitHub. |
+| [Import repositories](import.md)                      | Import bare repositories into your GitLab instance. |
+| [Import large project exports](../development/import_project.md#importing-via-a-rake-task) | Import large GitLab [project exports](../user/project/settings/import_export.md). |
+| [Integrity checks](../administration/raketasks/check.md) | Check the integrity of repositories, files, and LDAP. |
+| [LDAP maintenance](../administration/raketasks/ldap.md) | [LDAP](../administration/auth/ldap/index.md)-related tasks. |
+| [List repositories](list_repos.md)                    | List all GitLab-managed Git repositories on disk. |
+| [Migrate snippets to Git](migrate_snippets.md)        | Migrate GitLab Snippets to Git repositories, and show the migration status. |
+| [Praefect Rake tasks](../administration/raketasks/praefect.md) | [Praefect](../administration/gitaly/praefect.md)-related tasks. |
+| [Project import/export](../administration/raketasks/project_import_export.md) | Prepare for [project exports and imports](../user/project/settings/import_export.md). |
+| [Sample Prometheus data](generate_sample_prometheus_data.md) | Generate sample Prometheus data. |
+| [SPDX license list import](spdx.md)                   | Import a local copy of the [SPDX license list](https://spdx.org/licenses/) for matching [License Compliance policies](../user/compliance/license_compliance/index.md). |                                                     |
+| [Repository storage](../administration/raketasks/storage.md) | List and migrate existing projects and attachments from legacy storage to hashed storage. |
+| [Uploads migrate](../administration/raketasks/uploads/migrate.md) | Migrate uploads between local storage and object storage. |
+| [Uploads sanitize](../administration/raketasks/uploads/sanitize.md) | Remove EXIF data from images uploaded to earlier versions of GitLab. |
+| [Usage data](../administration/troubleshooting/gitlab_rails_cheat_sheet.md#generate-usage-ping) | Generate and troubleshoot [Usage Ping](../development/usage_ping/index.md). |
+| [User management](user_management.md)                 | Perform user management tasks. |
+| [Webhooks administration](web_hooks.md)               | Maintain project webhooks. |
+| [X.509 signatures](x509_signatures.md)                | Update X.509 commit signatures, which can be useful if the certificate store changed. |
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index 65953975011..145999132d7 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -75,7 +75,7 @@ curl --remote-name --progress "https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7
 echo 'cb9731a17487e0ad84037490a6baf8bfa31a09e8  ruby-2.7.2.tar.gz' | shasum -c - && tar xzf ruby-2.7.2.tar.gz
 cd ruby-2.7.2
 
-./configure --disable-install-rdoc
+./configure --disable-install-rdoc --enable-shared
 make
 sudo make install
 ```
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 01c1699bc4a..335bb3ec9f8 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8684,12 +8684,21 @@ msgstr ""
 msgid "Copy value"
 msgstr ""
 
+msgid "Corpus Management|Are you sure you want to delete the corpus?"
+msgstr ""
+
 msgid "CorpusManagement|Fuzz testing corpus management"
 msgstr ""
 
+msgid "CorpusManagement|Latest Job:"
+msgstr ""
+
 msgid "CorpusManagement|New corpus"
 msgstr ""
 
+msgid "CorpusManagement|Not Set"
+msgstr ""
+
 msgid "CorpusManagement|Total Size: %{totalSize}"
 msgstr ""
 
diff --git a/spec/frontend/admin/users/components/user_date_spec.js b/spec/frontend/admin/users/components/user_date_spec.js
index 6428b10059b..1a2f2938db5 100644
--- a/spec/frontend/admin/users/components/user_date_spec.js
+++ b/spec/frontend/admin/users/components/user_date_spec.js
@@ -1,6 +1,6 @@
 import { shallowMount } from '@vue/test-utils';
 
-import UserDate from '~/admin/users/components/user_date.vue';
+import UserDate from '~/vue_shared/components/user_date.vue';
 import { users } from '../mock_data';
 
 const mockDate = users[0].createdAt;
diff --git a/spec/frontend/admin/users/components/users_table_spec.js b/spec/frontend/admin/users/components/users_table_spec.js
index f1fcc20fb65..424b0deebd3 100644
--- a/spec/frontend/admin/users/components/users_table_spec.js
+++ b/spec/frontend/admin/users/components/users_table_spec.js
@@ -3,8 +3,8 @@ import { mount } from '@vue/test-utils';
 
 import AdminUserActions from '~/admin/users/components/user_actions.vue';
 import AdminUserAvatar from '~/admin/users/components/user_avatar.vue';
-import AdminUserDate from '~/admin/users/components/user_date.vue';
 import AdminUsersTable from '~/admin/users/components/users_table.vue';
+import AdminUserDate from '~/vue_shared/components/user_date.vue';
 
 import { users, paths } from '../mock_data';