Automatic merge of gitlab-org/gitlab-ce master

doc/development/architecture.md

-<script src="https://unpkg.com/mermaid@8.0.0/dist/mermaid.min.js"></script>
-<script>mermaid.initialize({startOnLoad:true});</script>
-
 # GitLab Architecture Overview
 
 ## Software delivery
@@ -213,7 +210,7 @@ To serve repositories over SSH there's an add-on application called gitlab-shell
 
 ### Components
 
-<div class="mermaid">
+```mermaid
 graph TB
 
   HTTP[HTTP/HTTPS] -- TCP 80, 443 --> NGINX(NGINX)
@@ -313,7 +310,7 @@ class Alertmanager defaultoff
 class SMTP defaultoff
 class ObjectStorage defaultoff
 class Geo defaultoff
-</div>
+```
 
 **Legend**:
 

doc/update/mysql_to_postgresql.md

@@ -45,6 +45,22 @@ For other distributions, follow the instructions in PostgreSQL's
 [download page](https://www.postgresql.org/download/) to add their repository
 and then install `pgloader`.
 
+If you are migrating to a Docker based installation, you will need to install
+pgloader within the container as it is not included in the container image.
+
+1. Start a shell session in the context of the running container:
+
+   ``` bash
+   docker exec -it gitlab bash
+   ```
+
+1. Install pgloader:
+    
+   ``` bash
+   apt-get update
+   apt-get -y install pgloader
+   ```
+
 ## Omnibus GitLab installations
 
 For [Omnibus GitLab packages](https://about.gitlab.com/install/), you'll first