diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-14 18:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-14 18:09:13 +0000 |
| commit | af21f4fd32f5a99ef57215b458e49f23af7e503d (patch) | |
| tree | 8d75c5fb2eaba0c4576013bf42c12f9f939116c4 | |
| parent | 1315fe70eb157453198ae75aae937dddf4e2066a (diff) | |
| download | gitlab-ce-af21f4fd32f5a99ef57215b458e49f23af7e503d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/architecture/blueprints/graphql_api/index.md | 6 | ||||
| -rw-r--r-- | doc/ssh/README.md | 2 | ||||
| -rw-r--r-- | lib/system_check/app/git_user_default_ssh_config_check.rb | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/architecture/blueprints/graphql_api/index.md b/doc/architecture/blueprints/graphql_api/index.md index 40d02168b3b..99047eb5964 100644 --- a/doc/architecture/blueprints/graphql_api/index.md +++ b/doc/architecture/blueprints/graphql_api/index.md @@ -178,6 +178,10 @@ DRIs: |------------------------------|------------------------| | Leadership | Darva Satcher | | Product | Patrick Deuley | -| Engineering | | +| Engineering | Paul Slaughter | +| Domain Expert / GraphQL | Charlie Ablett | +| Domain Expert / GraphQL | Alex Kalderimis | +| Domain Expert / GraphQL | Natalia Tepluhina | +| Domain Expert / Scalability | Bob Van Landuyt | <!-- vale gitlab.Spelling = YES --> diff --git a/doc/ssh/README.md b/doc/ssh/README.md index b15cd96d09e..11ab991a7f3 100644 --- a/doc/ssh/README.md +++ b/doc/ssh/README.md @@ -359,7 +359,7 @@ Git user has default SSH configuration? ... no sudo mv /var/lib/git/.ssh/id_rsa ~/gitlab-check-backup-1504540051 sudo mv /var/lib/git/.ssh/id_rsa.pub ~/gitlab-check-backup-1504540051 For more information see: - doc/ssh/README.md in section "SSH on the GitLab server" + [Overriding SSH settings on the GitLab server](#overriding-ssh-settings-on-the-gitlab-server) Please fix the error above and rerun the checks. ``` diff --git a/lib/system_check/app/git_user_default_ssh_config_check.rb b/lib/system_check/app/git_user_default_ssh_config_check.rb index a331f88873b..ea6bc9c4f01 100644 --- a/lib/system_check/app/git_user_default_ssh_config_check.rb +++ b/lib/system_check/app/git_user_default_ssh_config_check.rb @@ -31,7 +31,7 @@ module SystemCheck end try_fixing_it("mkdir #{backup_dir}", *instructions) - for_more_information('doc/ssh/README.md in section "SSH on the GitLab server"') + for_more_information('doc/ssh/README.md in section "Overriding SSH settings on the GitLab server"') fix_and_rerun end |