Add latest changes from gitlab-org/gitlab@master

7 files changed, 33 insertions, 13 deletions

diff --git a/doc/administration/auth/crowd.md b/doc/administration/auth/crowd.md
index ac63b4f2b97..8704782e78f 100644
--- a/doc/administration/auth/crowd.md
+++ b/doc/administration/auth/crowd.md
@@ -78,7 +78,7 @@ On the sign in page there should now be a Crowd tab in the sign in form.
 
 If you see an error message like the one below when you sign in after Crowd authentication is configured, you may want to consult the Crowd administrator for the Crowd log file to know the exact cause:
 
-```
+```plaintext
 could not authorize you from Crowd because invalid credentials
 ```
 
diff --git a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
index 800bb28c664..05ac42b912c 100644
--- a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
+++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
@@ -56,7 +56,7 @@ Using PowerShell you can output the **OU** structure as a table (_all names are
 Get-ADObject -LDAPFilter "(objectClass=*)" -SearchBase 'OU=GitLab INT,DC=GitLab,DC=org' -Properties CanonicalName | Format-Table Name,CanonicalName -A
 ```
 
-```
+```plaintext
 OU                CanonicalName
 ----              -------------
 GitLab INT        GitLab.org/GitLab INT
@@ -109,7 +109,7 @@ The two Active Directory specific values are `active_directory: true` and `uid:
 
 ### Example `gitlab.rb` LDAP
 
-```
+```ruby
 gitlab_rails['ldap_enabled'] = true
 gitlab_rails['ldap_servers'] = {
 'main' => {
@@ -186,7 +186,7 @@ ldapsearch -D "CN=GitLabSRV,CN=Users,DC=GitLab,DC=org" -w Password1 -p 389 -h ad
 
 **Full output of `ldapsearch` command:** - Filtering for _CN=Leroy Fox_
 
-```
+```plaintext
 # LDAPv3
 # base <OU=GitLab INT,DC=GitLab,DC=org> with scope subtree
 # filter: CN=Leroy Fox
diff --git a/doc/administration/auth/jwt.md b/doc/administration/auth/jwt.md
index e6b3287ce60..146baeba6d1 100644
--- a/doc/administration/auth/jwt.md
+++ b/doc/administration/auth/jwt.md
@@ -45,7 +45,7 @@ JWT will provide you with a secret key for you to use.
 
    For installation from source:
 
-   ```
+   ```yaml
    - { name: 'jwt',
        args: {
          secret: 'YOUR_APP_SECRET',
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md
index 84ddd4278ab..9f3e9e3de59 100644
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@@ -131,14 +131,14 @@ attribute. As a prerequisite, you must use an LDAP server that:
    - The additional NGINX server context must be configured to run on a different
      port:
 
-     ```
+     ```plaintext
      listen *:3444 ssl;
      ```
 
    - The additional NGINX server context must be configured to require the client
      side certificate:
 
-     ```
+     ```plaintext
      ssl_verify_depth 2;
      ssl_client_certificate /etc/ssl/certs/CA.pem;
      ssl_verify_client on;
@@ -147,14 +147,14 @@ attribute. As a prerequisite, you must use an LDAP server that:
    - The additional NGINX server context must be configured to forward the client
      side certificate:
 
-     ```
+     ```plaintext
      proxy_set_header    X-SSL-Client-Certificate    $ssl_client_escaped_cert;
      ```
 
    For example, the following is an example server context in an NGINX
    configuration file (eg. in `/etc/nginx/sites-available/gitlab-ssl`):
 
-   ```
+   ```plaintext
    server {
        listen *:3444 ssl;
 
diff --git a/doc/api/keys.md b/doc/api/keys.md
index 30b0cda6c8b..e05b1191715 100644
--- a/doc/api/keys.md
+++ b/doc/api/keys.md
@@ -129,8 +129,14 @@ Example response:
 }
 ```
 
-Deploy Keys are bound to the creating user, so if you query with a deploy key
-fingerprint you get additional information about the projects using that key:
+## Get user by deploy key fingerprint
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/119209) in GitLab 12.7.
+
+Deploy keys are bound to the creating user, so if you query with a deploy key
+fingerprint you get additional information about the projects using that key.
+
+Example request:
 
 ```sh
 curl --header "PRIVATE-TOKEN: <your_access_token>" 'https://gitlab.example.com/api/v4/keys?fingerprint=SHA256%3AnUhzNyftwADy8AH3wFY31tAKs7HufskYTte2aXo%2FlCg
diff --git a/doc/user/analytics/cycle_analytics.md b/doc/user/analytics/cycle_analytics.md
index dfc0f488ff9..e0bb4e03c41 100644
--- a/doc/user/analytics/cycle_analytics.md
+++ b/doc/user/analytics/cycle_analytics.md
@@ -163,6 +163,15 @@ This chart uses the global page filters for displaying data based on the selecte
 group, projects, and timeframe. In addition, specific stages can be selected
 from within the chart itself.
 
+### Chart median line
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/36675) in GitLab 12.7.
+
+The median line on the chart displays data that is offset by the number of days selected.
+For example, if 30 days worth of data has been selected (for example, 2019-12-16 to 2020-01-15) the
+median line will represent the previous 30 days worth of data (2019-11-16 to 2019-12-16)
+as a metric to compare against.
+
 ### Enabling chart
 
 By default, this chart is disabled for self-managed instances. To enable it, ask an
diff --git a/doc/user/project/operations/error_tracking.md b/doc/user/project/operations/error_tracking.md
index 361dfe57d78..3fcf6e39ee0 100644
--- a/doc/user/project/operations/error_tracking.md
+++ b/doc/user/project/operations/error_tracking.md
@@ -55,6 +55,7 @@ This page has:
 - A link to the Sentry issue.
 - A link to the GitLab commit if the Sentry [release id/version](https://docs.sentry.io/workflow/releases/?platform=javascript#configure-sdk) on the Sentry Issue's first release matches a commit SHA in your GitLab hosted project.
 - Other details about the issue, including a full stack trace.
+- In [GitLab 12.7 and newer](https://gitlab.com/gitlab-org/gitlab/issues/36246), language and urgency are displayed.
 
 By default, a **Create issue** button is displayed. Once you have used it to create an issue, the button is hidden.
 
@@ -78,6 +79,10 @@ Ignoring an error will prevent it from appearing in the [Error Tracking List](#e
 
 ### Resolving errors
 
-From within the [Error Details](#error-details) page you can resolve a Sentry error by simply clicking the **Resolve** button near the top of the page.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/39825) in GitLab 12.7.
 
-Marking an error as resolved indicates that the error has stopped firing events. If another event occurs, the error reverts to unresolved.
+From within the [Error Details](#error-details) page you can resolve a Sentry error by
+clicking the **Resolve** button near the top of the page.
+
+Marking an error as resolved indicates that the error has stopped firing events. If another event
+occurs, the error reverts to unresolved.