Skip to content

Commit

Permalink
Merge branch 'eread/fix-some-instances-of-repo' into 'master'
Browse files Browse the repository at this point in the history
Change some instances of repo to repository

See merge request gitlab-org/gitlab!30356
  • Loading branch information
amyq committed Apr 24, 2020
2 parents c6fbcd6 + 1a845a7 commit a5ae426
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion doc/administration/gitaly/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ two checks. The result of both of these checks is cached.
see if we can access filesystem underneath the Gitaly server
directly. If so, use the Rugged patch.
To see if GitLab Rails can access the repo filesystem directly, we use
To see if GitLab Rails can access the repository filesystem directly, we use
the following heuristic:
- Gitaly ensures that the filesystem has a metadata file in its root
Expand Down
2 changes: 1 addition & 1 deletion doc/administration/gitaly/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ You can adjust the `concurrency` of each RPC endpoint.
| ---- | ---- | -------- | ----------- |
| `concurrency` | array | yes | An array of RPC endpoints. |
| `rpc` | string | no | The name of the RPC endpoint (`/gitaly.RepositoryService/GarbageCollect`). |
| `max_per_repo` | integer | no | Concurrency per RPC per repo. |
| `max_per_repo` | integer | no | Concurrency per RPC per repository. |

Example:

Expand Down
4 changes: 2 additions & 2 deletions doc/administration/integration/plantuml.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
When [PlantUML](https://plantuml.com) integration is enabled and configured in
GitLab we are able to create simple diagrams in AsciiDoc and Markdown documents
created in snippets, wikis, and repos.
created in snippets, wikis, and repositories.

## PlantUML Server

Expand Down Expand Up @@ -118,7 +118,7 @@ that, login with an Admin account and do following:
## Creating Diagrams

With PlantUML integration enabled and configured, we can start adding diagrams to
our AsciiDoc snippets, wikis and repos using delimited blocks:
our AsciiDoc snippets, wikis, and repositories using delimited blocks:

- **Markdown**

Expand Down
4 changes: 2 additions & 2 deletions doc/administration/operations/fast_ssh_key_lookup.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sudo service sshd reload
```

Confirm that SSH is working by removing your user's SSH key in the UI, adding a
new one, and attempting to pull a repo.
new one, and attempting to pull a repository.

NOTE: **Note:** For Omnibus Docker, `AuthorizedKeysCommand` is setup by default in
GitLab 11.11 and later.
Expand All @@ -87,7 +87,7 @@ installation.
![Write to authorized keys setting](img/write_to_authorized_keys_setting.png)

Again, confirm that SSH is working by removing your user's SSH key in the UI,
adding a new one, and attempting to pull a repo.
adding a new one, and attempting to pull a repository.

Then you can backup and delete your `authorized_keys` file for best performance.

Expand Down
2 changes: 1 addition & 1 deletion doc/administration/scaling/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ References:
NOTE: **Note:** Note that depending on your workflow the below recommended
reference architectures may need to be adapted accordingly. Your workload
is influenced by factors such as - but not limited to - how active your users are,
how much automation you use, mirroring, and repo/change size. Additionally the
how much automation you use, mirroring, and repository/change size. Additionally the
shown memory values are given directly by [GCP machine types](https://cloud.google.com/compute/docs/machine-types).
On different cloud vendors a best effort like for like can be used.

Expand Down
4 changes: 2 additions & 2 deletions doc/api/import.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ POST /import/github
|------------|---------|----------|---------------------|
| `personal_access_token` | string | yes | GitHub personal access token |
| `repo_id` | integer | yes | GitHub repository ID |
| `new_name` | string | no | New repo name |
| `target_namespace` | string | yes | Namespace to import repo into |
| `new_name` | string | no | New repository name |
| `target_namespace` | string | yes | Namespace to import repository into |

```shell
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --data "personal_access_token=abc123&repo_id=12345&target_namespace=root" https://gitlab.example.com/api/v4/import/github
Expand Down

0 comments on commit a5ae426

Please sign in to comment.