Add latest changes from gitlab-org/gitlab@master

4 files changed, 17 insertions, 13 deletions

diff --git a/doc/api/graphql/getting_started.md b/doc/api/graphql/getting_started.md
index 961d4da8c1e..57c0fcc659c 100644
--- a/doc/api/graphql/getting_started.md
+++ b/doc/api/graphql/getting_started.md
@@ -289,16 +289,16 @@ Example: Issues can be sorted by creation date:
 
 ```graphql
 query {
-     project(fullPath: "gitlab-org/graphql-sandbox") {
-       name
-        issues(sort: created_asc) {
-        nodes {
-          title
-          createdAt
-        }
+  project(fullPath: "gitlab-org/graphql-sandbox") {
+   name
+    issues(sort: created_asc) {
+      nodes {
+        title
+        createdAt
       }
     }
   }
+}
 ```
 
 ## Pagination
@@ -324,9 +324,9 @@ query {
           title
         }
       }
-    pageInfo {
-      endCursor
-      hasNextPage
+      pageInfo {
+        endCursor
+        hasNextPage
       }
     }
   }
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index f256977e31f..c352a5a4fd6 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -293,6 +293,10 @@ Scripts specified in `after_script` are executed in a new shell, separate from a
   - Command aliases and variables exported in `script` scripts.
   - Changes outside of the working tree (depending on the Runner executor), like
     software installed by a `before_script` or `script` script.
+- Have a separate timeout, which is hard coded to 5 minutes. See
+  [related issue](https://gitlab.com/gitlab-org/gitlab-runner/issues/2716) for details.
+- Do not affect the job's exit code. If the `script` section succeeds and the
+  `after_script` times out or fails, the job will exit with code `0` (`Job Succeeded`).
 
 It's possible to overwrite a globally defined `before_script` or `after_script`
 if you set it per-job:
diff --git a/doc/development/fe_guide/frontend_faq.md b/doc/development/fe_guide/frontend_faq.md
index aaa2fb0246b..cbe0a78370d 100644
--- a/doc/development/fe_guide/frontend_faq.md
+++ b/doc/development/fe_guide/frontend_faq.md
@@ -51,10 +51,10 @@ bound on mounting and destroyed when the button is, mitigating the above
 issue. It also has bindings to a particular container or modal ID
 available, to work with the focus trap created by our GlModal.
 
-### 3. A gitlab-ui component not conforming to [Pajamas Design System](https://design.gitlab.com/)
+### 3. A `gitlab-ui` component not conforming to [Pajamas Design System](https://design.gitlab.com/)
 
 Some [Pajamas Design System](https://design.gitlab.com/) components implemented in
-gitlab-ui do not conform with the design system specs because they lack some
+`gitlab-ui` do not conform with the design system specs because they lack some
 planned features or are not correctly styled yet. In the Pajamas website, a
 banner on top of the component examples indicates that:
 
diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md
index c6424e39ac2..4ec3c79b0ae 100644
--- a/doc/development/fe_guide/style/scss.md
+++ b/doc/development/fe_guide/style/scss.md
@@ -11,7 +11,7 @@ easy to maintain, and performant for the end-user.
 
 ### Utility Classes
 
-As part of the effort for [cleaning up our CSS and moving our components into gitlab-ui](https://gitlab.com/groups/gitlab-org/-/epics/950)
+As part of the effort for [cleaning up our CSS and moving our components into `gitlab-ui`](https://gitlab.com/groups/gitlab-org/-/epics/950)
 led by the [GitLab UI WG](https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/20623) we prefer the use of utility classes over adding new CSS. However, complex CSS can be addressed by adding component classes.
 
 #### Where are utility classes defined?