diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 03:09:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 03:09:14 +0000 |
commit | 78fe72d153260c355fdfd533b125026cce310da7 (patch) | |
tree | 0d90106443bea87cc24e2834273ae6c8dcac0260 /doc/administration | |
parent | 88797b994a7dfd9bfab2a5d5431f088f17078b9f (diff) | |
download | gitlab-ce-78fe72d153260c355fdfd533b125026cce310da7.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/gitaly/img/praefect_architecture_v12_9.png | bin | 158447 -> 44098 bytes | |||
-rw-r--r-- | doc/administration/operations/unicorn.md | 2 | ||||
-rw-r--r-- | doc/administration/packages/index.md | 4 | ||||
-rw-r--r-- | doc/administration/troubleshooting/gdb-stuck-ruby.txt | 6 | ||||
-rw-r--r-- | doc/administration/troubleshooting/img/AzureAD-basic_SAML.png | bin | 96021 -> 30365 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/AzureAD-claims.png | bin | 55574 -> 14213 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/OneLogin-SSOsettings.png | bin | 85242 -> 25397 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/OneLogin-app_details.png | bin | 61390 -> 18305 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/OneLogin-encryption.png | bin | 34245 -> 9980 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/OneLogin-parameters.png | bin | 17139 -> 5051 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/img/OneLogin-userAdd.png | bin | 32711 -> 10021 bytes | |||
-rw-r--r-- | doc/administration/troubleshooting/kubernetes_cheat_sheet.md | 6 |
12 files changed, 9 insertions, 9 deletions
diff --git a/doc/administration/gitaly/img/praefect_architecture_v12_9.png b/doc/administration/gitaly/img/praefect_architecture_v12_9.png Binary files differindex 3937789094c..b68e495cb17 100644 --- a/doc/administration/gitaly/img/praefect_architecture_v12_9.png +++ b/doc/administration/gitaly/img/praefect_architecture_v12_9.png diff --git a/doc/administration/operations/unicorn.md b/doc/administration/operations/unicorn.md index 561cd7ac1ce..bab20a76546 100644 --- a/doc/administration/operations/unicorn.md +++ b/doc/administration/operations/unicorn.md @@ -65,7 +65,7 @@ maximum memory threshold (in bytes) for the Unicorn worker killer by setting the following values `/etc/gitlab/gitlab.rb`: - For GitLab **12.7** and newer: - + ```ruby unicorn['worker_memory_limit_min'] = "1024 * 1 << 20" unicorn['worker_memory_limit_max'] = "1280 * 1 << 20" diff --git a/doc/administration/packages/index.md b/doc/administration/packages/index.md index a12aec3c7b3..40867fc15b6 100644 --- a/doc/administration/packages/index.md +++ b/doc/administration/packages/index.md @@ -118,10 +118,10 @@ upload packages: #'path_style' => false # If true, use 'host/bucket_name/object' instead of 'bucket_name.host/object'. } ``` - + NOTE: **Note:** Some build tools, like Gradle, must make `HEAD` requests to Amazon S3 to pull a dependency’s metadata. The `gitlab_rails['packages_object_store_proxy_download']` property must be set to `true`. Without this setting, GitLab won't act as a proxy to the Amazon S3 service, and will instead return the signed URL. This will cause a `HTTP 403 Forbidden` response, since Amazon S3 expects a signed URL. - + 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. diff --git a/doc/administration/troubleshooting/gdb-stuck-ruby.txt b/doc/administration/troubleshooting/gdb-stuck-ruby.txt index 13d5dfcffa4..de8d704f9e3 100644 --- a/doc/administration/troubleshooting/gdb-stuck-ruby.txt +++ b/doc/administration/troubleshooting/gdb-stuck-ruby.txt @@ -1,6 +1,6 @@ # Here's the script I'll use to demonstrate - it just loops forever: -$ cat test.rb +$ cat test.rb #!/usr/bin/env ruby loop do @@ -75,7 +75,7 @@ Thread 1 (Thread 0xb74d76c0 (LWP 1343)): at eval.c:5778 #5 rb_call0 (klass=3075304600, recv=3075299660, id=9393, oid=9393, argc=1, argv=0xbf85f490, body=0xb74c85a8, flags=2) at eval.c:5928 -#6 0x0805e35d in rb_call (klass=3075304600, recv=3075299660, mid=9393, argc=1, argv=0xbf85f490, scope=1, +#6 0x0805e35d in rb_call (klass=3075304600, recv=3075299660, mid=9393, argc=1, argv=0xbf85f490, scope=1, self=<optimized out>) at eval.c:6176 #7 0x080651ec in rb_eval (self=3075299660, n=0xb74c4e1c) at eval.c:3521 #8 0x0805c31c in rb_yield_0 (val=6, self=3075299660, klass=<optimized out>, flags=0, avalue=0) at eval.c:5095 @@ -139,4 +139,4 @@ A debugging session is active. Quit anyway? (y or n) y Detaching from program: /opt/vagrant_ruby/bin/ruby, process 1343 -$ +$ diff --git a/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png b/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png Binary files differindex a553dc182ce..e86ad7572e8 100644 --- a/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png +++ b/doc/administration/troubleshooting/img/AzureAD-basic_SAML.png diff --git a/doc/administration/troubleshooting/img/AzureAD-claims.png b/doc/administration/troubleshooting/img/AzureAD-claims.png Binary files differindex ef594390ce0..aab92288704 100644 --- a/doc/administration/troubleshooting/img/AzureAD-claims.png +++ b/doc/administration/troubleshooting/img/AzureAD-claims.png diff --git a/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png b/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png Binary files differindex 72737b9a017..58f936d8567 100644 --- a/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png +++ b/doc/administration/troubleshooting/img/OneLogin-SSOsettings.png diff --git a/doc/administration/troubleshooting/img/OneLogin-app_details.png b/doc/administration/troubleshooting/img/OneLogin-app_details.png Binary files differindex 3e36a001d1b..77618960897 100644 --- a/doc/administration/troubleshooting/img/OneLogin-app_details.png +++ b/doc/administration/troubleshooting/img/OneLogin-app_details.png diff --git a/doc/administration/troubleshooting/img/OneLogin-encryption.png b/doc/administration/troubleshooting/img/OneLogin-encryption.png Binary files differindex a1b90873a5a..2b811409bd0 100644 --- a/doc/administration/troubleshooting/img/OneLogin-encryption.png +++ b/doc/administration/troubleshooting/img/OneLogin-encryption.png diff --git a/doc/administration/troubleshooting/img/OneLogin-parameters.png b/doc/administration/troubleshooting/img/OneLogin-parameters.png Binary files differindex c9ff4f8f018..a2fa734152c 100644 --- a/doc/administration/troubleshooting/img/OneLogin-parameters.png +++ b/doc/administration/troubleshooting/img/OneLogin-parameters.png diff --git a/doc/administration/troubleshooting/img/OneLogin-userAdd.png b/doc/administration/troubleshooting/img/OneLogin-userAdd.png Binary files differindex c7187fe5dd6..54c1ecd2e68 100644 --- a/doc/administration/troubleshooting/img/OneLogin-userAdd.png +++ b/doc/administration/troubleshooting/img/OneLogin-userAdd.png diff --git a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md index 38c0661da06..ec59705ca99 100644 --- a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md +++ b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md @@ -77,11 +77,11 @@ and they will assist you with any issues you are having. ```shell kubectl get cronjobs ``` - + When one configures [cron-based backups](https://docs.gitlab.com/charts/backup-restore/backup.html#cron-based-backup), you will be able to see the new schedule here. Some details about the schedules can be found in [Running Automated Tasks with a CronJob](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#creating-a-cron-job) - + ## GitLab-specific Kubernetes information - Minimal config that can be used to test a Kubernetes Helm chart can be found @@ -167,7 +167,7 @@ and they will assist you with any issues you are having. ```shell kubectl exec -it <task-runner-pod-name> -- /srv/gitlab/bin/rails dbconsole -p ``` - + - How to get info about Helm installation status: ```shell |