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

5 files changed, 47 insertions, 21 deletions

diff --git a/doc/update/README.md b/doc/update/README.md
index 8056460ceaa..f36a304495c 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -22,7 +22,7 @@ Based on your installation, choose a section below that fits your needs.
   source](upgrading_from_source.md) - The guidelines for upgrading Community
   Edition and Enterprise Edition from source.
 - [Patch versions](patch_versions.md) guide includes the steps needed for a
-  patch version, eg. 6.2.0 to 6.2.1, and apply to both Community and Enterprise
+  patch version, such as 6.2.0 to 6.2.1, and apply to both Community and Enterprise
   Editions.
 
 In the past we used separate documents for the upgrading instructions, but we
@@ -178,7 +178,7 @@ If you wish to upgrade your GitLab installation from Community to Enterprise
 Edition, follow the guides below based on the installation method:
 
 - [Source CE to EE update guides](upgrading_from_ce_to_ee.md) - The steps are very similar
-  to a version upgrade: stop the server, get the code, update config files for
+  to a version upgrade: stop the server, get the code, update configuration files for
   the new functionality, install libraries and do migrations, update the init
   script, start the application and check its status.
 - [Omnibus CE to EE](https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition) - Follow this guide to update your Omnibus
@@ -192,6 +192,16 @@ possible.
 
 ## Version specific upgrading instructions
 
+### 13.1.0
+
+In 13.1.0, you must upgrade to either:
+
+- At least Git v2.24 (previously, the minimum required version was Git v2.22).
+- The recommended Git v2.26.
+
+Failure to do so will result in internal errors in the Gitaly service in some RPCs due
+to the use of the new `--end-of-options` Git flag.
+
 ### 12.2.0
 
 In 12.2.0, we enabled Rails' authenticated cookie encryption. Old sessions are
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index f226ad9ac28..0092df7b89d 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -7,7 +7,7 @@ comments: false
 ## Select Version to Install
 
 Make sure you view [this update guide](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/update/patch_versions.md) from the tag (version) of GitLab you would like to install.
-In most cases this should be the highest numbered production tag (without rc in it).
+In most cases this should be the highest numbered production tag (without `rc` in it).
 You can select the tag in the version dropdown in the top left corner of GitLab (below the menu bar).
 
 ### 0. Backup
@@ -35,7 +35,7 @@ sudo -u git -H git checkout -- Gemfile.lock db/structure.sql locale
 sudo -u git -H git checkout LATEST_TAG -b LATEST_TAG
 ```
 
-### 3. Install libs, migrations, etc
+### 3. Install libraries, migrations, etc
 
 ```shell
 cd /home/git/gitlab
@@ -49,10 +49,9 @@ sudo -u git -H bundle clean
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 
 # Compile GetText PO files
-# Internationalization was added in `v9.2.0` so these commands are only
+# Internationalization was added in `v9.2.0` so this command is only
 # required for versions equal or major to it.
-sudo -u git -H bundle exec rake gettext:pack RAILS_ENV=production
-sudo -u git -H bundle exec rake gettext:po_to_json RAILS_ENV=production
+sudo -u git -H bundle exec rake gettext:compile RAILS_ENV=production
 
 # Clean up assets and cache
 sudo -u git -H bundle exec rake yarn:install gitlab:assets:clean gitlab:assets:compile cache:clear RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"
diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md
index 2415d3b2741..78227f18457 100644
--- a/doc/update/upgrading_from_ce_to_ee.md
+++ b/doc/update/upgrading_from_ce_to_ee.md
@@ -54,7 +54,7 @@ sudo -u git -H git remote add -f ee https://gitlab.com/gitlab-org/gitlab.git
 sudo -u git -H git checkout EE_BRANCH
 ```
 
-### 3. Install libs, migrations, etc
+### 3. Install libraries, migrations, etc
 
 ```shell
 cd /home/git/gitlab
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index 76a0d5bde98..af461b93910 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -12,7 +12,7 @@ Make sure you view this update guide from the branch (version) of GitLab you
 would like to install (e.g., `11.8`. You can select the version in the version
 dropdown at the top left corner of GitLab (below the menu bar).
 
-In all examples, replace `BRANCH` with the branch for the version you uprading
+In all examples, replace `BRANCH` with the branch for the version you upgrading
 to (e.g. `11-8-stable` for `11.8`), and replace `PREVIOUS_BRANCH` with the
 branch for the version you are upgrading from (e.g. `11-7-stable` for `11.7`).
 
@@ -67,9 +67,9 @@ 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.5.tar.gz
-echo '1416ce288fb8bfeae07a12b608540318c9cace71  ruby-2.6.5.tar.gz' | shasum -c - && tar xzf ruby-2.6.5.tar.gz
-cd ruby-2.6.5
+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
 
 ./configure --disable-install-rdoc
 make
@@ -122,12 +122,17 @@ rm go1.13.5.linux-amd64.tar.gz
 
 ### 6. Update Git
 
-NOTE: To check the minimum required Git version, see [Git versions](../install/requirements.md#git-versions).
+CAUTION: **Caution:**
+From GitLab 13.1, you must use at least Git v2.24 (previous minimum version was v2.22).
+Git v2.26 is recommended.
+
+To check you are running the minimum required Git version, see
+[Git versions](../install/requirements.md#git-versions).
 
 In Debian or Ubuntu:
 
 ```shell
-# Make sure Git is version 2.21.0 or higher
+# Make sure Git is version 2.24.0 or higher
 git --version
 
 # Remove packaged Git
@@ -147,9 +152,9 @@ make install
 
 # Download and compile from source
 cd /tmp
-curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.21.0.tar.gz
-echo '85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee  git-2.21.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.21.0.tar.gz
-cd git-2.21.0/
+curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.26.0.tar.gz
+echo 'aa168c2318e7187cd295a645f7370cc6d71a324aafc932f80f00c780b6a26bed  git-2.26.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.26.0.tar.gz
+cd git-2.26.0/
 ./configure --with-libpcre
 make prefix=/usr/local all
 
@@ -285,7 +290,7 @@ add the following line to `config/initializers/smtp_settings.rb`:
 ActionMailer::Base.delivery_method = :smtp
 ```
 
-See [smtp_settings.rb.sample](https://gitlab.com/gitlab-org/gitlab/blob/master/config/initializers/smtp_settings.rb.sample#L13) as an example.
+See [`smtp_settings.rb.sample`](https://gitlab.com/gitlab-org/gitlab/blob/master/config/initializers/smtp_settings.rb.sample#L13) as an example.
 
 #### Init script
 
@@ -313,7 +318,7 @@ For Ubuntu 16.04.1 LTS:
 sudo systemctl daemon-reload
 ```
 
-### 13. Install libs, migrations, etc
+### 13. Install libraries, migrations, etc
 
 ```shell
 cd /home/git/gitlab
@@ -378,6 +383,18 @@ Example:
 Additional instructions here.
 -->
 
+### 13.0.1
+
+As part of [deprecating Rack Attack throttles on Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4750), Rack Attack initializer on GitLab
+was renamed from [`config/initializers/rack_attack_new.rb` to `config/initializers/rack_attack.rb`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33072).
+If this file exists on your installation, consider creating a backup before updating:
+
+```shell
+cd /home/git/gitlab
+
+cp config/initializers/rack_attack.rb config/initializers/rack_attack_backup.rb
+```
+
 ## Troubleshooting
 
 ### 1. Revert the code to the previous version
diff --git a/doc/update/upgrading_postgresql_using_slony.md b/doc/update/upgrading_postgresql_using_slony.md
index fdd035c7940..5133e4cf4e5 100644
--- a/doc/update/upgrading_postgresql_using_slony.md
+++ b/doc/update/upgrading_postgresql_using_slony.md
@@ -56,7 +56,7 @@ server.
 
 ## Installing Slony
 
-Slony will be used to upgrade the database without requiring long downtimes.
+Slony will be used to upgrade the database without requiring a long downtime.
 Slony can be downloaded from <https://www.slony.info/>. If you have installed
 PostgreSQL using your operating system's package manager you may also be able to
 install Slony using said package manager.
@@ -88,7 +88,7 @@ test -f /opt/gitlab/embedded/bin/slonik_init_cluster && echo 'Slony Perl tools a
 ```
 
 This assumes Slony was installed to `/opt/gitlab/embedded`. If Slony was
-installed properly the output of these commands will be (the mentioned "slonik"
+installed properly the output of these commands will be (the mentioned `slonik`
 version may be different):
 
 ```plaintext