Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 14 deletions

diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index 073e2010fd2..7f314bc5e31 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -261,7 +261,10 @@ gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN'
 # Configure the gitlab-shell API callback URL. Without this, `git push` will
 # fail. This can be your 'front door' GitLab URL or an internal load
 # balancer.
-gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
+# Possible values could be: 'http://10.23.101.53', 'https://gitlab.example.com',
+# etc. Please replace GITLAB_SERVER_ADDRESS with proper value and change schema
+# to 'https' in case you use encrypted connection.
+gitlab_rails['internal_api_url'] = 'http://GITLAB_SERVER_ADDRESS'
 
 # Replace PRAEFECT_INTERNAL_TOKEN below with a real secret.
 gitaly['auth_token'] = 'PRAEFECT_INTERNAL_TOKEN'
@@ -324,6 +327,12 @@ git_data_dirs({
 
 # Replace GITLAB_SHELL_SECRET_TOKEN below with real secret
 gitlab_shell['secret_token'] = 'GITLAB_SHELL_SECRET_TOKEN'
+
+# Possible values could be: 'http://10.23.101.53', 'https://gitlab.example.com',
+# etc. Please replace GITLAB_SERVER_ADDRESS with proper value and change schema
+# to 'https' in case you use encrypted connection. For more info please refer
+# to https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab
+external_url "http://<GITLAB_SERVER_ADDRESS>"
 ```
 
 Replace `GITLAB_SHELL_SECRET_TOKEN` and `PRAEFECT_EXTERNAL_TOKEN`
diff --git a/doc/development/fe_guide/icons.md b/doc/development/fe_guide/icons.md
index d81a520c5f3..36537a22e67 100644
--- a/doc/development/fe_guide/icons.md
+++ b/doc/development/fe_guide/icons.md
@@ -42,25 +42,25 @@ sprite_icon(icon_name, size: nil, css_class: '')
 
 ### Usage in Vue
 
-We have a special Vue component for our sprite icons in `\vue_shared\components\icon.vue`.
+[GitLab UI][gitlab-ui], our components library, provides a component to display sprite icons.
 
 Sample usage :
 
-```javascript
+```html
 <script>
-import Icon from "~/vue_shared/components/icon.vue"
+import { GlIcon } from "@gitlab/ui";
 
 export default {
   components: {
-    Icon,
+    GlIcon,
   },
 };
 <script>
+
 <template>
-  <icon
+  <gl-icon
     name="issues"
     :size="24"
-    class="icon-danger"
   />
 </template>
 ```
@@ -95,7 +95,7 @@ To use an SVG illustrations in a template provide the path as a property and dis
 
 Component:
 
-```js
+```html
 <script>
 export default {
   props: {
@@ -106,6 +106,7 @@ export default {
   },
 };
 <script>
+
 <template>
   <img :src="svgIllustrationPath" />
 </template>
@@ -114,3 +115,4 @@ export default {
 [npm]: https://www.npmjs.com/package/@gitlab/svgs
 [gitlab-svgs]: https://gitlab.com/gitlab-org/gitlab-svgs
 [svg-preview]: https://gitlab-org.gitlab.io/gitlab-svgs
+[gitlab-ui]: https://gitlab-org.gitlab.io/gitlab-ui/
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 32b4c97cb62..29208c1bf76 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -253,7 +253,6 @@ graph RL;
   E[review-build-cng];
   F[build-qa-image];
   G[review-deploy];
-  G2["schedule:review-deploy<br/>(master only)"];
   I["karma, jest, webpack-dev-server, static-analysis"];
   I2["karma-foss, jest-foss<br/>(EE default refs only)"];
   J["compile-assets pull-push-cache<br/>(master only)"];
@@ -297,19 +296,16 @@ subgraph "`post-test` stage"
 
 subgraph "`review-prepare` stage"
     E -.-> |needs| C;
-    E2["schedule:review-build-cng<br/>(master schedule only)"] -.-> |needs| C;
     end
 
 subgraph "`review` stage"
-    G --> |happens after| E
-    G2 --> |happens after| E2
+    G -.-> |needs| E
     end
 
 subgraph "`qa` stage"
     Q -.-> |needs| C;
     Q -.-> |needs| F;
-    QA1["review-qa-smoke, review-qa-all, review-performance, dast"] -.-> |needs and depends on| G;
-    QA2["schedule:review-performance<br/>(master only)"] -.-> |needs and depends on| G2;
+    QA1["review-qa-smoke, review-qa-all, review-performance, dast"] -.-> |needs| G;
     end
 
 subgraph "`post-qa` stage"