Add latest changes from gitlab-org/gitlab@master

3 files changed, 33 insertions, 16 deletions

diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md
index 93c7df335ca..0b8c66805ae 100644
--- a/doc/administration/server_hooks.md
+++ b/doc/administration/server_hooks.md
@@ -25,14 +25,21 @@ Server-side Git hooks are typically placed in the repository's `hooks`
 subdirectory. In GitLab, hook directories are symlinked to the GitLab Shell
 `hooks` directory for ease of maintenance between GitLab Shell upgrades.
 Server hooks are implemented differently, but the behavior is exactly the same
-once the hook is created. Follow the steps below to set up a server hook for a
+once the hook is created.
+
+NOTE: **Note:**
+If you are not using [hashed storage](repository_storage_types.md#hashed-storage), the project's
+repository directory might not exactly match the instructions below. In that case,
+for an installation from source the path is usually `/home/git/repositories/<group>/<project>.git`.
+For Omnibus installs the path is usually `/var/opt/gitlab/git-data/repositories/<group>/<project>.git`.
+
+Follow the steps below to set up a server hook for a
 repository:
 
-1. Pick a project that needs a server hook.
-1. On the GitLab server, navigate to the project's repository directory.
-   For an installation from source the path is usually
-   `/home/git/repositories/<group>/<project>.git`. For Omnibus installs the path is
-   usually `/var/opt/gitlab/git-data/repositories/<group>/<project>.git`.
+1. Find that project's path on the GitLab server, by navigating to the
+   **Admin area > Projects**. From there, select the project for which you
+   would like to add a hook. You can find the path to the project's repository
+   under **Gitaly relative path** on that page.
 1. Create a new directory in this location called `custom_hooks`.
 1. Inside the new `custom_hooks` directory, create a file with a name matching
    the hook type. For a pre-receive hook the file name should be `pre-receive`
@@ -43,8 +50,7 @@ repository:
    type. For example, if the script is in Ruby the shebang will probably be
    `#!/usr/bin/env ruby`.
 
-That's it! Assuming the hook code is properly implemented the hook will fire
-as appropriate.
+Assuming the hook code is properly implemented the hook will run as appropriate.
 
 ## Set a global server hook for all repositories
 
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index dbf4f8623b8..b98d6200cad 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -151,15 +151,26 @@ request, be sure to start the `dont-interrupt-me` job before pushing.
 
 ## PostgreSQL versions testing
 
+### Current versions testing
+
+| Where? | PG version |
+| ------ | ------ |
+| MRs | 9.6 |
+| `master` (non-scheduled pipelines) | 9.6 / 11 |
+| 2-hourly scheduled pipelines | 9.6 / 11 |
+| Nightly scheduled pipeline | 9.6 / 10 |
+
+### Long-term plan
+
 We follow the [PostgreSQL versions shipped with Omnibus GitLab](https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html):
 
-|        | 12.10 (April 2020) | 13.0 (May 2020) | 13.1 (June 2020) | 13.2 (July 2020) | 13.3 (August 2020) | 13.4, 13.5   | 13.6 (November 2020) | 14.0 (May 2021?) |
+| PG version | 12.10 (April 2020) | 13.0 (May 2020) | 13.1 (June 2020) | 13.2 (July 2020) | 13.3 (August 2020) | 13.4, 13.5   | 13.6 (November 2020) | 14.0 (May 2021?) |
 | ------ | ------------------ | --------------- | ---------------- | ---------------- | ------------------ | ------------ | -------------------- | ---------------- |
-| PG9.6  | nightly            | -               | -                | -                | -                  | -            | -                    | -                |
-| PG10   | `master`           | -               | -                | -                | -                  | -            | -                    | -                |
-| PG11   | MRs/`master`       | MRs/`master`    | MRs/`master`     | MRs/`master`     | MRs/`master`       | MRs/`master` | nightly              | -                |
-| PG12   | -                  | -               | -                | -                | `master`           | `master`     | MRs/`master`         | `master`         |
-| PG13   | -                  | -               | -                | -                | -                  | -            | -                    | MRs/`master`     |
+| PG9.6  | MRs/`master`/`2-hour`/`nightly` | -               | -                | -                | -                  | -            | -                    | -                |
+| PG10   | `nightly`           | -               | -                | -                | -                  | -            | -                    | -                |
+| PG11   | `master`/`2-hour` | MRs/`master`/`2-hour`/`nightly` | MRs/`master`/`2-hour`/`nightly` | MRs/`master`/`2-hour`/`nightly` | MRs/`master`/`2-hour`/`nightly` | MRs/`master`/`2-hour`/`nightly` | `nightly`              | -                |
+| PG12   | -                  | -               | -                | -                | `master`/`2-hour` | `master`/`2-hour` | MRs/`master`/`2-hour`/`nightly`         | `master`/`2-hour` |
+| PG13   | -                  | -               | -                | -                | -                  | -            | -                    | MRs/`master`/`2-hour`/`nightly`     |
 
 ## Pipeline types
 
diff --git a/doc/user/packages/pypi_repository/index.md b/doc/user/packages/pypi_repository/index.md
index c763793316b..2904ce06531 100644
--- a/doc/user/packages/pypi_repository/index.md
+++ b/doc/user/packages/pypi_repository/index.md
@@ -224,8 +224,8 @@ pip install --index-url https://__token__:<personal_access_token>@gitlab.com/api
 Where:
 
 - `<package_name>` is the package name.
-- `<personal_access_token>` is your personal access token.
-- `<project_id>` is your project id number.
+- `<personal_access_token>` is a personal access token with the `read_api` scope.
+- `<project_id>` is the project id number.
 
 If you were following the guide above and want to test installing the
 `MyPyPiPackage` package, you can run the following: