Add latest changes from gitlab-org/gitlab@13-6-stable-ee

6 files changed, 53 insertions, 22 deletions

diff --git a/doc/api/invitations.md b/doc/api/invitations.md
index 6fd2b26d80f..00dc4252380 100644
--- a/doc/api/invitations.md
+++ b/doc/api/invitations.md
@@ -97,7 +97,7 @@ Example response:
    {
      "id": 1,
      "invite_email": "member@example.org",
-     "invited_at": "2020-10-22T14:13:35Z",
+     "created_at": "2020-10-22T14:13:35Z",
      "access_level": 30,
      "expires_at": "2020-11-22T14:13:35Z",
      "user_name": "Raymond Smith",
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 87e3cd1ea06..a6d00ad140e 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -224,12 +224,6 @@ make
 sudo make install
 ```
 
-Then install the Bundler gem (a version below 2.x):
-
-```shell
-sudo gem install bundler --no-document --version '< 2'
-```
-
 ## 3. Go
 
 In GitLab 8.0 and later, GitLab has several daemons written in Go. To install
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 4a61831ff86..3f02544a5ab 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -45,7 +45,13 @@ Please consider using a virtual machine to run GitLab.
 
 ### Ruby versions
 
-GitLab requires Ruby (MRI) 2.6. Beginning in GitLab 12.2, we no longer support Ruby 2.5 and lower.
+From GitLab 13.6:
+
+- Ruby 2.7 and later is required.
+
+From GitLab 12.2:
+
+- Ruby 2.6 and later is required.
 
 You must use the standard MRI implementation of Ruby.
 We love [JRuby](https://www.jruby.org/) and [Rubinius](https://github.com/rubinius/rubinius#the-rubinius-language-platform), but GitLab
diff --git a/doc/update/README.md b/doc/update/README.md
index 774d468cb76..0534d793613 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -312,6 +312,8 @@ installation-specific upgrade instructions, based on how you installed GitLab:
 
 ### 13.6.0
 
+Ruby 2.7.2 is required. GitLab will not start with Ruby 2.6.6 or older versions.
+
 The required Git version is Git v2.29 or higher.
 
 ### 13.3.0
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index d2a3466984e..4eedc9bb89f 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -61,8 +61,8 @@ sudo service gitlab stop
 
 ### 3. Update Ruby
 
-NOTE: Beginning in GitLab 12.2, we only support Ruby 2.6 or higher, and dropped
-support for Ruby 2.5. Be sure to upgrade if necessary.
+NOTE: Beginning in GitLab 13.6, we only support Ruby 2.7 or higher, and dropped
+support for Ruby 2.6. Be sure to upgrade if necessary.
 
 You can check which version you are running with `ruby -v`.
 
@@ -70,21 +70,15 @@ Download Ruby and compile it:
 
 ```shell
 mkdir /tmp/ruby && cd /tmp/ruby
-curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.6.tar.gz
-echo '2d78048e293817f38d4ede4ebc7873013e97bb0b  ruby-2.6.6.tar.gz' | shasum -c - && tar xzf ruby-2.6.6.tar.gz
-cd ruby-2.6.6
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz
+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
 make
 sudo make install
 ```
 
-Install Bundler:
-
-```shell
-sudo gem install bundler --no-document --version '< 2'
-```
-
 ### 4. Update Node.js
 
 NOTE: To check the minimum required Node.js version, see [Node.js versions](../install/requirements.md#nodejs-versions).
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 8ae92a42581..37623c94eda 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -188,15 +188,12 @@ To set your current status:
 1. Set the desired emoji and/or status message.
 1. Click **Set status**. Alternatively, you can click **Remove status** to remove your user status entirely.
 
-![Busy status indicator](img/busy_status_indicator_v13_6.png)
-
 or
 
 1. Click your avatar.
 1. Select **Profile**.
 1. Click **Edit profile** (pencil icon).
 1. Enter your status message in the **Your status** text field.
-   1. Alternatively, select the **Busy** checkbox ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/259649) in GitLab 13.6}.
 1. Click **Add status emoji** (smiley face), and select the desired emoji.
 1. Click **Update profile settings**.
 
@@ -204,6 +201,44 @@ You can also set your current status [using the API](../../api/users.md#user-sta
 
 If you previously selected the "Busy" checkbox, remember to deselect it when you become available again.
 
+## Busy status indicator
+
+> - Introduced in GitLab 13.6.
+> - It's [deployed behind a feature flag](../feature_flags.md), disabled by default.
+> - It's disabled on GitLab.com.
+> - It's not recommended for production use.
+> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-busy-status-feature).
+
+To indicate to others that you are busy, you can set an indicator
+
+![Busy status indicator](img/busy_status_indicator_v13_6.png)
+
+To set the busy status indicator, either:
+
+- Set it directly:
+
+  1. Click your avatar.
+  1. Click **Set status**, or **Edit status** if you have already set a status.
+  1. Select the **Busy** checkbox
+
+- Set it on your profile:
+
+  1. Click your avatar.
+  1. Select **Profile**.
+  1. Click **Edit profile** (**{pencil}**).
+  1. Select the **Busy** checkbox
+
+### Enable busy status feature
+
+The busy status feature is deployed behind a feature flag and is **disabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md) can enable it for your instance from the [rails console](../../administration/feature_flags.md#start-the-gitlab-rails-console).
+
+To enable it:
+
+```ruby
+Feature.enable(:set_user_availability_status)
+```
+
 ## Commit email
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/21598) in GitLab 11.4.