diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 03:09:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 03:09:42 +0000 |
commit | 01ff651394ec2df7df5ed0282c96fb8133980cb9 (patch) | |
tree | e4b0b3b6200fed4d08c356daedda5017d5fe3eb1 | |
parent | cdf9ef52fe13899be29068992a9858f8b0e72457 (diff) | |
download | gitlab-ce-01ff651394ec2df7df5ed0282c96fb8133980cb9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | doc/administration/troubleshooting/linux_cheat_sheet.md | 6 | ||||
-rw-r--r-- | doc/development/i18n/proofreader.md | 11 | ||||
-rw-r--r-- | doc/install/requirements.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/accessibility_testing.md | 3 |
4 files changed, 14 insertions, 8 deletions
diff --git a/doc/administration/troubleshooting/linux_cheat_sheet.md b/doc/administration/troubleshooting/linux_cheat_sheet.md index a03b8d1868e..7af4219caa3 100644 --- a/doc/administration/troubleshooting/linux_cheat_sheet.md +++ b/doc/administration/troubleshooting/linux_cheat_sheet.md @@ -159,7 +159,7 @@ top -o %CPU ```shell # strace a process -strace -tt -T -f -y -s 1024 -p <pid> +strace -tt -T -f -y -yy -s 1024 -p <pid> # -tt print timestamps with microsecond accuracy @@ -169,12 +169,14 @@ strace -tt -T -f -y -s 1024 -p <pid> # -y print the path associated with file handles +# -yy print socket and device file handle details + # -s max string length to print for an event # -o output file # run strace on all unicorn processes -ps auwx | grep unicorn | awk '{ print " -p " $2}' | xargs strace -tt -T -f -y -s 1024 -o /tmp/unicorn.txt +ps auwx | grep unicorn | awk '{ print " -p " $2}' | xargs strace -tt -T -f -y -yy -s 1024 -o /tmp/unicorn.txt ``` See the [strace zine](https://wizardzines.com/zines/strace/) for a quick walkthrough. diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md index 743529b9bbc..1170103490b 100644 --- a/doc/development/i18n/proofreader.md +++ b/doc/development/i18n/proofreader.md @@ -82,11 +82,12 @@ are very appreciative of the work done by translators and proofreaders! - Romanian - Proofreaders needed. - Russian - - Nikita Grylov - [GitLab](https://gitlab.com/nixel2007), [CrowdIn](https://crowdin.com/profile/nixel2007) - - Alexy Lustin - [GitLab](https://gitlab.com/allustin), [CrowdIn](https://crowdin.com/profile/lustin) - - Mark Minakou - [GitLab](https://gitlab.com/sandzhaj), [CrowdIn](https://crowdin.com/profile/sandzhaj) - - NickVolynkin - [CrowdIn](https://crowdin.com/profile/NickVolynkin) - - Andrey Komarov - [GitLab](https://gitlab.com/elkamarado), [CrowdIn](https://crowdin.com/profile/kamarado) + - Nikita Grylov - [GitLab](https://gitlab.com/nixel2007), [Crowdin](https://crowdin.com/profile/nixel2007) + - Alexy Lustin - [GitLab](https://gitlab.com/allustin), [Crowdin](https://crowdin.com/profile/lustin) + - Mark Minakou - [GitLab](https://gitlab.com/sandzhaj), [Crowdin](https://crowdin.com/profile/sandzhaj) + - NickVolynkin - [Crowdin](https://crowdin.com/profile/NickVolynkin) + - Andrey Komarov - [GitLab](https://gitlab.com/elkamarado), [Crowdin](https://crowdin.com/profile/kamarado) + - Iaroslav Postovalov - [GitLab](https://gitlab/CMDR_Tvis), [Crowdin](https://crowdin.com/profile/CMDR_Tvis) - Serbian (Cyrillic) - Proofreaders needed. - Serbian (Latin) diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 6a116e358f1..f78525659f2 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -189,7 +189,7 @@ To change the Unicorn workers when you have the Omnibus package (which defaults ## Puma Workers For most instances we recommend using: max(CPU cores * 0.9, 2) = Puma workers. -For example a node with 4 cores would have 3 Unicorn workers. +For example a node with 4 cores would have 3 Puma workers. For all machines that have 4GB and up we recommend a minimum of three Puma workers. If you have a 2GB machine we recommend to configure only one Puma worker to prevent excessive swapping. diff --git a/doc/user/project/merge_requests/accessibility_testing.md b/doc/user/project/merge_requests/accessibility_testing.md index bfd62b77314..755bf0447e3 100644 --- a/doc/user/project/merge_requests/accessibility_testing.md +++ b/doc/user/project/merge_requests/accessibility_testing.md @@ -31,6 +31,9 @@ included with your GitLab installation, as shown below. Add the following to your `.gitlab-ci.yml` file: ```yaml +stages: + - accessibility + variables: a11y_urls: "https://about.gitlab.com https://gitlab.com/users/sign_in" |