From f302f46c636131924a07fdaf46d8efd2740dd22d Mon Sep 17 00:00:00 2001
From: James Ramsay <jramsay@gitlab.com>
Date: Tue, 5 Jun 2018 23:21:35 +0000
Subject: [PATCH 1/3] Add registry debug server docs

---
 doc/user/project/container_registry.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/user/project/container_registry.md b/doc/user/project/container_registry.md
index 9c5e3509046..bc01cfc276c 100644
--- a/doc/user/project/container_registry.md
+++ b/doc/user/project/container_registry.md
@@ -269,9 +269,28 @@ What does this mean? This strongly suggests that the S3 user does not have the r
 The solution: check the [IAM permissions again](https://docs.docker.com/registry/storage-drivers/s3/).
 Once the right permissions were set, the error will go away.
 
+#### Enable the registry debug server
+
+The optional debug server can be enabled by setting the registry debug address
+in your `gitlab.rb` configuration.
+
+```
+registry['debug_addr'] = "localhost:5001"
+```
+
+After adding the setting, [reconfigure] GitLab to apply the change.
+
+Use curl to request debug output from the debug server:
+
+```bash
+curl localhost:5001/debug/health
+curl localhost:5001/debug/vars
+```
+
 [ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
 [ce-11845]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845
 [ce-17894]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17894
 [docker-docs]: https://docs.docker.com/engine/userguide/intro/
 [pat]: ../profile/personal_access_tokens.md
 [pdt]: ../project/deploy_tokens/index.md
+[reconfigure]: ../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
\ No newline at end of file

From 288ce1118c1646e66f1464b49da4524465624e49 Mon Sep 17 00:00:00 2001
From: James Ramsay <jramsay@gitlab.com>
Date: Wed, 6 Jun 2018 01:36:41 +0000
Subject: [PATCH 2/3] Move section to basic troubleshooting

---
 doc/user/project/container_registry.md | 36 +++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/doc/user/project/container_registry.md b/doc/user/project/container_registry.md
index bc01cfc276c..7b66b39ab28 100644
--- a/doc/user/project/container_registry.md
+++ b/doc/user/project/container_registry.md
@@ -143,6 +143,24 @@ docker login registry.example.com -u <your_username> -p <your_access_token>
    for errors (e.g. `/var/log/gitlab/gitlab-rails/production.log`). You may be able to find clues
    there.
 
+#### Enable the registry debug server
+
+The optional debug server can be enabled by setting the registry debug address
+in your `gitlab.rb` configuration.
+
+```
+registry['debug_addr'] = "localhost:5001"
+```
+
+After adding the setting, [reconfigure] GitLab to apply the change.
+
+Use curl to request debug output from the debug server:
+
+```bash
+curl localhost:5001/debug/health
+curl localhost:5001/debug/vars
+```
+
 ### Advanced Troubleshooting
 
 >**NOTE:** The following section is only recommended for experts.
@@ -269,24 +287,6 @@ What does this mean? This strongly suggests that the S3 user does not have the r
 The solution: check the [IAM permissions again](https://docs.docker.com/registry/storage-drivers/s3/).
 Once the right permissions were set, the error will go away.
 
-#### Enable the registry debug server
-
-The optional debug server can be enabled by setting the registry debug address
-in your `gitlab.rb` configuration.
-
-```
-registry['debug_addr'] = "localhost:5001"
-```
-
-After adding the setting, [reconfigure] GitLab to apply the change.
-
-Use curl to request debug output from the debug server:
-
-```bash
-curl localhost:5001/debug/health
-curl localhost:5001/debug/vars
-```
-
 [ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040
 [ce-11845]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845
 [ce-17894]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17894

From 9f9e107aea4f3f9f55eb66137e229a4dcf0bc01a Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 6 Jun 2018 02:56:54 +0000
Subject: [PATCH 3/3] Add ruby Markdown type

---
 doc/user/project/container_registry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/project/container_registry.md b/doc/user/project/container_registry.md
index 7b66b39ab28..03302b3815d 100644
--- a/doc/user/project/container_registry.md
+++ b/doc/user/project/container_registry.md
@@ -148,7 +148,7 @@ docker login registry.example.com -u <your_username> -p <your_access_token>
 The optional debug server can be enabled by setting the registry debug address
 in your `gitlab.rb` configuration.
 
-```
+```ruby
 registry['debug_addr'] = "localhost:5001"
 ```