Automatic merge of gitlab-org/gitlab-ce master

doc/administration/auth/ldap.md

@@ -396,21 +396,34 @@ omniauth-ldap.
 
 ### Escaping special characters
 
-If the `user_filter` DN contains special characters. For example, a comma:
+The `user_filter` DN can contain special characters. For example:
 
-```
-OU=GitLab, Inc,DC=gitlab,DC=com
-```
+- A comma:
 
-This character needs to be escaped as documented in [RFC 4515](https://tools.ietf.org/search/rfc4515).
+    ```
+    OU=GitLab, Inc,DC=gitlab,DC=com
+    ```
 
-Due to the way the string is parsed, the special character needs to be converted
-to hex and `\\5C\\` (`5C` = `\` in hex) added before it.
-As an example the above DN would look like
+- Open and close brackets:
 
-```
-OU=GitLab\\5C\\2C Inc,DC=gitlab,DC=com
-```
+    ```
+    OU=Gitlab (Inc),DC=gitlab,DC=com
+    ```
+
+    These characters must be escaped as documented in 
+    [RFC 4515](https://tools.ietf.org/search/rfc4515).
+
+- Escape commas with `\2C`. For example:
+
+    ```
+    OU=GitLab\2C Inc,DC=gitlab,DC=com
+    ```
+
+- Escape open and close brackets with `\28` and `\29`, respectively. For example:
+
+    ```
+    OU=Gitlab \28Inc\29,DC=gitlab,DC=com
+    ```
 
 ## Enabling LDAP sign-in for existing GitLab users
 

doc/ci/variables/predefined_variables.md

@@ -30,7 +30,7 @@ future GitLab releases.**
 | `CI_BUILDS_DIR`                         | all    | 11.10  | Top-level directory where builds are executed. |
 | `CI_CONCURRENT_ID`                      | all    | 11.10  | Unique ID of build execution within a single executor. |
 | `CI_CONCURRENT_PROJECT_ID`              | all    | 11.10  | Unique ID of build execution within a single executor and project. |
-| `CI_COMMIT_BEFORE_SHA`                  | 11.2   | all    | The previous latest commit present on a branch before a push request. |
+| `CI_COMMIT_BEFORE_SHA`                  | 11.2   | all    | The previous latest commit present on a branch before a push request. Only populated when there is a merge request associated with the pipeline. |
 | `CI_COMMIT_DESCRIPTION`                 | 10.8   | all    | The description of the commit: the message without first line, if the title is shorter than 100 characters; full message in other case. |
 | `CI_COMMIT_MESSAGE`                     | 10.8   | all    | The full commit message. |
 | `CI_COMMIT_REF_NAME`                    | 9.0    | all    | The branch or tag name for which project is built |