kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2021-03-14 18:09:13 +00:00
parent 1315fe70eb
commit af21f4fd32
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/architecture/blueprints/graphql_api/index.md
View file

@ -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 -->

2
doc/ssh/README.md
View file

@ -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.
```

2
lib/system_check/app/git_user_default_ssh_config_check.rb
View file

@ -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