Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 8 deletions

diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 2164bc3dc5f..9b6ad3f2755 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -168,6 +168,16 @@ These groups are checked on each SAML login and user attributes updated as neces
 This feature **does not** allow you to
 automatically add users to GitLab [Groups](../user/group/index.md).
 
+Support for these groups depends on your [subscription](https://about.gitlab.com/pricing/)
+and whether you've installed [GitLab Enterprise Edition (EE)](https://about.gitlab.com/install/).
+
+| Group                        | Tier               | GitLab Enterprise Edition (EE) Only? |
+|------------------------------|--------------------|--------------------------------------|
+| [Required](#required-groups) | **(FREE SELF)**    | Yes                                  |
+| [External](#external-groups) | **(FREE SELF)**    | No                                   |
+| [Admin](#admin-groups)       | **(FREE SELF)**    | Yes                                  |
+| [Auditor](#auditor-groups)   | **(PREMIUM SELF)** | Yes                                  |
+
 ### Requirements
 
 First you need to tell GitLab where to look for group information. For this you
@@ -189,7 +199,7 @@ The name of the attribute can be anything you like, but it must contain the grou
 to which a user belongs. In order to tell GitLab where to find these groups, you need
 to add a `groups_attribute:` element to your SAML settings.
 
-### Required groups **(PREMIUM SELF)**
+### Required groups **(FREE SELF)**
 
 Your IdP passes Group Information to the SP (GitLab) in the SAML Response. You need to configure GitLab to identify:
 
@@ -215,7 +225,7 @@ Example:
   } }
 ```
 
-### External groups **(PREMIUM SELF)**
+### External groups **(FREE SELF)**
 
 SAML login supports automatic identification on whether a user should be considered an [external user](../user/permissions.md#external-users). This is based on the user's group membership in the SAML identity provider.
 
@@ -233,7 +243,7 @@ SAML login supports automatic identification on whether a user should be conside
   } }
 ```
 
-### Admin groups **(PREMIUM SELF)**
+### Admin groups **(FREE SELF)**
 
 The requirements are the same as the previous settings, your IdP needs to pass Group information to GitLab, you need to tell
 GitLab where to look for the groups in the SAML response, and which group(s) should be
diff --git a/doc/push_rules/push_rules.md b/doc/push_rules/push_rules.md
index 37880f22ffe..c3816155121 100644
--- a/doc/push_rules/push_rules.md
+++ b/doc/push_rules/push_rules.md
@@ -89,12 +89,12 @@ The following options are available:
 | Push rule                       | Description |
 |---------------------------------|-------------|
 | Removal of tags with `git push` | Forbid users to remove Git tags with `git push`. Tags can be deleted through the web UI. |
-| Check whether author is a GitLab user | Restrict commits by author (email) to existing GitLab users. |
-| Committer restriction **(PREMIUM)** | GitLab rejects any commit that was not committed by the current authenticated user. |
+| Check whether the commit author is a GitLab user | Restrict commits to existing GitLab users (checked against their emails). |
+| Reject unverified users **(PREMIUM)** | GitLab rejects any commit that was not committed by an authenticated user. |
 | Check whether commit is signed through GPG **(PREMIUM)** | Reject commit when it is not signed through GPG. Read [signing commits with GPG](../user/project/repository/gpg_signed_commits/index.md). |
-| Prevent committing secrets to Git | GitLab rejects any files that are likely to contain secrets. Read [what files are forbidden](#prevent-pushing-secrets-to-the-repository). |
-| Restrict by commit message | Only commit messages that match this regular expression are allowed to be pushed. Leave empty to allow any commit message. Uses multiline mode, which can be disabled using `(?-m)`. |
-| Restrict by commit message (negative match) | Only commit messages that do not match this regular expression are allowed to be pushed. Leave empty to allow any commit message. Uses multiline mode, which can be disabled using `(?-m)`. |
+| Prevent pushing secret files | GitLab rejects any files that are likely to contain secrets. See the [forbiden file names](#prevent-pushing-secrets-to-the-repository). |
+| Require expression in commit messages | Only commit messages that match this regular expression are allowed to be pushed. Leave empty to allow any commit message. Uses multiline mode, which can be disabled using `(?-m)`. |
+| Reject expression in commit messages | Only commit messages that do not match this regular expression are allowed to be pushed. Leave empty to allow any commit message. Uses multiline mode, which can be disabled using `(?-m)`. |
 | Restrict by branch name | Only branch names that match this regular expression are allowed to be pushed. Leave empty to allow any branch name. |
 | Restrict by commit author's email | Only commit author's email that match this regular expression are allowed to be pushed. Leave empty to allow any email. |
 | Prohibited file names | Any committed filenames that match this regular expression and do not already exist in the repository are not allowed to be pushed. Leave empty to allow any filenames. See [common examples](#prohibited-file-names). |
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index 73823dd15e8..a8435424d62 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -35,6 +35,7 @@ These shortcuts are available in most areas of GitLab
 | <kbd>Shift</kbd> + <kbd>m</kbd> | Go to your Merge requests page.|
 | <kbd>Shift</kbd> + <kbd>t</kbd> | Go to your To-Do List page. |
 | <kbd>p</kbd> + <kbd>b</kbd>     | Show/hide the Performance Bar. |
+| <kbd>g</kbd> + <kbd>x</kbd>     | Toggle between [GitLab](https://gitlab.com/) and [GitLab Next](https://next.gitlab.com/). |
 
 Additionally, the following shortcuts are available when editing text in text fields,
 for example comments, replies, issue descriptions, and merge request descriptions: