Commit f9606de0 authored by Toon Claes's avatar Toon Claes

Merge branch 'docs-fix-typos' into 'master'

Docs: Fix various typos in docs and code comments

See merge request gitlab-org/gitlab!40402
parents 2adb5457 08be6054
...@@ -93,7 +93,7 @@ The following documentation relates to the DevOps **Manage** stage: ...@@ -93,7 +93,7 @@ The following documentation relates to the DevOps **Manage** stage:
|:--------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |:--------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [Authentication and<br/>Authorization](administration/auth/README.md) **(CORE ONLY)** | Supported authentication and authorization providers. | | [Authentication and<br/>Authorization](administration/auth/README.md) **(CORE ONLY)** | Supported authentication and authorization providers. |
| [GitLab Value Stream Analytics](user/project/cycle_analytics.md) | Measure the time it takes to go from an [idea to production](https://about.gitlab.com/blog/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/#from-idea-to-production-with-gitlab) for each project you have. | | [GitLab Value Stream Analytics](user/project/cycle_analytics.md) | Measure the time it takes to go from an [idea to production](https://about.gitlab.com/blog/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/#from-idea-to-production-with-gitlab) for each project you have. |
| [Instance-level Anlytics](user/admin_area/analytics/index.md) | Discover statistics on how many GitLab features you use and user activity. | | [Instance-level Analytics](user/admin_area/analytics/index.md) | Discover statistics on how many GitLab features you use and user activity. |
<div align="right"> <div align="right">
<a type="button" class="btn btn-default" href="#overview"> <a type="button" class="btn btn-default" href="#overview">
......
...@@ -279,7 +279,7 @@ This is not compatible with the consolidated object storage form. ...@@ -279,7 +279,7 @@ This is not compatible with the consolidated object storage form.
OpenStack Swift is only supported with the storage-specific form. See the OpenStack Swift is only supported with the storage-specific form. See the
[S3 settings](#s3-compatible-connection-settings) if you want to use the consolidated form. [S3 settings](#s3-compatible-connection-settings) if you want to use the consolidated form.
While OpenStack Swift provides S3 compatibliity, some users may want to use the While OpenStack Swift provides S3 compatibility, some users may want to use the
[Swift API](https://docs.openstack.org/swift/latest/api/object_api_v1_overview.html). [Swift API](https://docs.openstack.org/swift/latest/api/object_api_v1_overview.html).
Here are the valid connection settings below for the Swift API, provided by Here are the valid connection settings below for the Swift API, provided by
[fog-openstack](https://github.com/fog/fog-openstack): [fog-openstack](https://github.com/fog/fog-openstack):
......
...@@ -217,7 +217,7 @@ to perform a number of troubleshooting steps on Sidekiq. ...@@ -217,7 +217,7 @@ to perform a number of troubleshooting steps on Sidekiq.
These are the administrative commands and it should only be used if currently These are the administrative commands and it should only be used if currently
admin interface is not suitable due to scale of installation. admin interface is not suitable due to scale of installation.
All this commands should be run using `gitlab-rails console`. All these commands should be run using `gitlab-rails console`.
### View the queue size ### View the queue size
......
...@@ -21,7 +21,7 @@ You can find your correlation ID by searching in either place. ...@@ -21,7 +21,7 @@ You can find your correlation ID by searching in either place.
You can use your browser's developer tools to monitor and inspect network You can use your browser's developer tools to monitor and inspect network
activity with the site that you're visiting. See the links below for network monitoring activity with the site that you're visiting. See the links below for network monitoring
documenation for some popular browsers. documentation for some popular browsers.
- [Network Monitor - Firefox Developer Tools](https://developer.mozilla.org/en-US/docs/Tools/Network_Monitor) - [Network Monitor - Firefox Developer Tools](https://developer.mozilla.org/en-US/docs/Tools/Network_Monitor)
- [Inspect Network Activity In Chrome DevTools](https://developers.google.com/web/tools/chrome-devtools/network/) - [Inspect Network Activity In Chrome DevTools](https://developers.google.com/web/tools/chrome-devtools/network/)
......
...@@ -1333,8 +1333,8 @@ PUT /projects/:id/issues/:issue_iid/reorder ...@@ -1333,8 +1333,8 @@ PUT /projects/:id/issues/:issue_iid/reorder
|-------------|---------|----------|--------------------------------------| |-------------|---------|----------|--------------------------------------|
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
| `issue_iid` | integer | yes | The internal ID of a project's issue | | `issue_iid` | integer | yes | The internal ID of a project's issue |
| `move_after_id` | integer | no | The ID of a projet's issue to move this issue after | | `move_after_id` | integer | no | The ID of a project's issue to move this issue after |
| `move_before_id` | integer | no | The ID of a projet's issue to move this issue before | | `move_before_id` | integer | no | The ID of a project's issue to move this issue before |
```shell ```shell
curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/4/issues/85/reorder?move_after_id=51&move_before_id=92" curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/4/issues/85/reorder?move_after_id=51&move_before_id=92"
......
...@@ -4246,7 +4246,7 @@ script: ...@@ -4246,7 +4246,7 @@ script:
- ls -al cache/ - ls -al cache/
``` ```
The configurtion above will result in `git fetch` being called this way: The configuration above will result in `git fetch` being called this way:
```shell ```shell
git fetch origin $REFSPECS --depth 50 --prune git fetch origin $REFSPECS --depth 50 --prune
......
...@@ -13,7 +13,7 @@ This document explains how to develop [GitLab CI/CD templates](../../ci/examples ...@@ -13,7 +13,7 @@ This document explains how to develop [GitLab CI/CD templates](../../ci/examples
All template files reside in the `lib/gitlab/ci/templates` directory, and are categorized by the following sub-directories: All template files reside in the `lib/gitlab/ci/templates` directory, and are categorized by the following sub-directories:
| Sub-directroy | Content | [Selectable in UI](#make-sure-the-new-template-can-be-selected-in-ui) | | Sub-directory | Content | [Selectable in UI](#make-sure-the-new-template-can-be-selected-in-ui) |
|---------------|--------------------------------------------------------------|-----------------------------------------------------------------------| |---------------|--------------------------------------------------------------|-----------------------------------------------------------------------|
| `/AWS/*` | Cloud Deployment (AWS) related jobs | No | | `/AWS/*` | Cloud Deployment (AWS) related jobs | No |
| `/Jobs/*` | Auto DevOps related jobs | Yes | | `/Jobs/*` | Auto DevOps related jobs | Yes |
......
...@@ -138,7 +138,7 @@ up confusion or verify that the end result matches what they had in mind, to ...@@ -138,7 +138,7 @@ up confusion or verify that the end result matches what they had in mind, to
database specialists to get input on the data model or specific queries, or to database specialists to get input on the data model or specific queries, or to
any other developer to get an in-depth review of the solution. any other developer to get an in-depth review of the solution.
If an author is unsure if a merge request needs a [domain experts's](#domain-experts) opinion, that's If an author is unsure if a merge request needs a [domain expert's](#domain-experts) opinion, that's
usually a pretty good sign that it does, since without it the required level of usually a pretty good sign that it does, since without it the required level of
confidence in their solution will not have been reached. confidence in their solution will not have been reached.
......
...@@ -1288,7 +1288,7 @@ However, the following might help the reader connect the text to the user interf ...@@ -1288,7 +1288,7 @@ However, the following might help the reader connect the text to the user interf
| **{monitor}** Monitoring | View GitLab system information, and information on background jobs, logs, health checks, requests profiles, and audit logs. | | **{monitor}** Monitoring | View GitLab system information, and information on background jobs, logs, health checks, requests profiles, and audit logs. |
| **{messages}** Messages | Send and manage broadcast messages for your users. | | **{messages}** Messages | Send and manage broadcast messages for your users. |
Use an icon when you find youself having to describe an interface element. For example: Use an icon when you find yourself having to describe an interface element. For example:
- Do: Click the Admin Area icon ( **{admin}** ). - Do: Click the Admin Area icon ( **{admin}** ).
- Don't: Click the Admin Area icon (the wrench icon). - Don't: Click the Admin Area icon (the wrench icon).
......
...@@ -929,7 +929,7 @@ export default { ...@@ -929,7 +929,7 @@ export default {
- We can use slots and/or scoped slots to achieve the same thing as we did with mixins. If you only need an EE component there is no need to create the CE component. - We can use slots and/or scoped slots to achieve the same thing as we did with mixins. If you only need an EE component there is no need to create the CE component.
1. First, we have a CE component that can render a slot incase we need EE template and functionality to be decorated on top of the CE base. 1. First, we have a CE component that can render a slot in case we need EE template and functionality to be decorated on top of the CE base.
```vue ```vue
// ./ce/my_component.vue // ./ce/my_component.vue
...@@ -1030,7 +1030,7 @@ separate SCSS file in an appropriate directory within `app/assets/stylesheets`. ...@@ -1030,7 +1030,7 @@ separate SCSS file in an appropriate directory within `app/assets/stylesheets`.
In some cases, this is not entirely possible or creating dedicated SCSS file is an overkill, In some cases, this is not entirely possible or creating dedicated SCSS file is an overkill,
e.g. a text style of some component is different for EE. In such cases, e.g. a text style of some component is different for EE. In such cases,
styles are usually kept in stylesheet that is common for both CE and EE, and it is wise styles are usually kept in a stylesheet that is common for both CE and EE, and it is wise
to isolate such ruleset from rest of CE rules (along with adding comment describing the same) to isolate such ruleset from rest of CE rules (along with adding comment describing the same)
to avoid conflicts during CE to EE merge. to avoid conflicts during CE to EE merge.
......
...@@ -205,7 +205,7 @@ Potential resolutions: ...@@ -205,7 +205,7 @@ Potential resolutions:
[Contact GitLab Support](https://about.gitlab.com/support) if none of these reasons apply. [Contact GitLab Support](https://about.gitlab.com/support) if none of these reasons apply.
#### Fixing synchonization issues #### Fixing synchronization issues
If Jira displays incorrect information (such as deleted branches), you may need to If Jira displays incorrect information (such as deleted branches), you may need to
resynchronize the information. To do so: resynchronize the information. To do so:
...@@ -239,7 +239,7 @@ For a walkthrough of the integration with GitLab for Jira, watch [Configure GitL ...@@ -239,7 +239,7 @@ For a walkthrough of the integration with GitLab for Jira, watch [Configure GitL
NOTE: **Note:** NOTE: **Note:**
The GitLab user only needs access when adding a new namespace. For syncing with Jira, we do not depend on the user's token. The GitLab user only needs access when adding a new namespace. For syncing with Jira, we do not depend on the user's token.
![Confure namespace on GitLab Jira App](img/jira_dev_panel_setup_com_3.png) ![Configure namespace on GitLab Jira App](img/jira_dev_panel_setup_com_3.png)
After a namespace is added, all future commits, branches and merge requests of all projects under that namespace will be synced to Jira. Past data cannot be synced at the moment. After a namespace is added, all future commits, branches and merge requests of all projects under that namespace will be synced to Jira. Past data cannot be synced at the moment.
......
...@@ -299,7 +299,7 @@ providers without two factor authentication. ...@@ -299,7 +299,7 @@ providers without two factor authentication.
Define the allowed providers using an array, e.g. `["twitter", 'google_oauth2']`, or as Define the allowed providers using an array, e.g. `["twitter", 'google_oauth2']`, or as
`true`/`false` to allow all providers or none. This option should only be configured `true`/`false` to allow all providers or none. This option should only be configured
for providers which already have two factor authentication (default: false). for providers which already have two factor authentication (default: false).
This configration dose not apply to SAML. This configuration dose not apply to SAML.
```ruby ```ruby
gitlab_rails['omniauth_allow_bypass_two_factor'] = ['twitter', 'google_oauth2'] gitlab_rails['omniauth_allow_bypass_two_factor'] = ['twitter', 'google_oauth2']
......
...@@ -243,7 +243,7 @@ git bisect A..E ...@@ -243,7 +243,7 @@ git bisect A..E
Bisect will provide us with commit ID of the middle commit to test, and then guide us Bisect will provide us with commit ID of the middle commit to test, and then guide us
through simple bisection process. You can read more about it [in official Git Tools](https://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git) through simple bisection process. You can read more about it [in official Git Tools](https://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git)
In our example we will end up with commit `B`, that introduced bug/error. We have In our example we will end up with commit `B`, that introduced the bug/error. We have
4 options on how to remove it (or part of it) from our repository. 4 options on how to remove it (or part of it) from our repository.
- Undo (swap additions and deletions) changes introduced by commit `B`: - Undo (swap additions and deletions) changes introduced by commit `B`:
...@@ -409,7 +409,7 @@ the cleanup of detached commits (happens automatically). ...@@ -409,7 +409,7 @@ the cleanup of detached commits (happens automatically).
### Where modifying history is generally acceptable ### Where modifying history is generally acceptable
Modified history breaks the development chain of other developers, as changed Modified history breaks the development chain of other developers, as changed
history does not have matching commits'ids. For that reason it should not be history does not have matching commit IDs. For that reason it should not be
used on any public branch or on branch that *might* be used by other developers. used on any public branch or on branch that *might* be used by other developers.
When contributing to big open source repositories (for example, [GitLab](https://gitlab.com/gitlab-org/gitlab/blob/master/CONTRIBUTING.md#contribution-acceptance-criteria) When contributing to big open source repositories (for example, [GitLab](https://gitlab.com/gitlab-org/gitlab/blob/master/CONTRIBUTING.md#contribution-acceptance-criteria)
itself), it is acceptable to *squash* commits into a single one, to present a itself), it is acceptable to *squash* commits into a single one, to present a
......
...@@ -102,7 +102,7 @@ for you to install. ...@@ -102,7 +102,7 @@ for you to install.
For this guide, we need to install Ingress. Ingress provides load balancing, For this guide, we need to install Ingress. Ingress provides load balancing,
SSL termination, and name-based virtual hosting, using NGINX behind SSL termination, and name-based virtual hosting, using NGINX behind
the scenes. Make sure to switch the toogle to the enabled position before installing. the scenes. Make sure to switch the toggle to the enabled position before installing.
Both logging and blocking modes are available for WAF. While logging mode is useful for Both logging and blocking modes are available for WAF. While logging mode is useful for
auditing anomalous traffic, blocking mode ensures the traffic doesn't reach past Ingress. auditing anomalous traffic, blocking mode ensures the traffic doesn't reach past Ingress.
......
...@@ -153,7 +153,7 @@ https://gitlab.example.com/-/readiness?token=ACCESS_TOKEN ...@@ -153,7 +153,7 @@ https://gitlab.example.com/-/readiness?token=ACCESS_TOKEN
``` ```
NOTE: **Note:** NOTE: **Note:**
In case the database or Redis service are unaccessible, the probe endpoints response is not guaranteed to be correct. In case the database or Redis service are inaccessible, the probe endpoints response is not guaranteed to be correct.
You should switch to [IP whitelist](#ip-whitelist) from deprecated access token to avoid it. You should switch to [IP whitelist](#ip-whitelist) from deprecated access token to avoid it.
<!-- ## Troubleshooting <!-- ## Troubleshooting
......
...@@ -460,7 +460,7 @@ DAST can be [configured](#customizing-the-dast-settings) using environment varia ...@@ -460,7 +460,7 @@ DAST can be [configured](#customizing-the-dast-settings) using environment varia
| `DAST_FULL_SCAN_DOMAIN_VALIDATION_REQUIRED` | boolean | Set to `true` to require [domain validation](#domain-validation) when running DAST full scans. Not supported for API scans. Default: `false` | | `DAST_FULL_SCAN_DOMAIN_VALIDATION_REQUIRED` | boolean | Set to `true` to require [domain validation](#domain-validation) when running DAST full scans. Not supported for API scans. Default: `false` |
| `DAST_AUTO_UPDATE_ADDONS` | boolean | ZAP add-ons are pinned to specific versions in the DAST Docker image. Set to `true` to download the latest versions when the scan starts. Default: `false` | | `DAST_AUTO_UPDATE_ADDONS` | boolean | ZAP add-ons are pinned to specific versions in the DAST Docker image. Set to `true` to download the latest versions when the scan starts. Default: `false` |
| `DAST_API_HOST_OVERRIDE` | string | Used to override domains defined in API specification files. Only supported when importing the API specification from a URL. Example: `example.com:8080` | | `DAST_API_HOST_OVERRIDE` | string | Used to override domains defined in API specification files. Only supported when importing the API specification from a URL. Example: `example.com:8080` |
| `DAST_EXCLUDE_RULES` | string | Set to a comma-separated list of Vulnerability Rule IDs to exclude them from running during the scan. Rule IDs are numbers and can be found from the DAST log or on the [ZAP project](https://github.com/zaproxy/zaproxy/blob/develop/docs/scanners.md). For example, `HTTP Parameter Override` has a rule ID of `10026`. **Note:** In earlier versions of GitLab the excluded rules were executed but alerts they generated were supressed. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118641) in GitLab 12.10. | | `DAST_EXCLUDE_RULES` | string | Set to a comma-separated list of Vulnerability Rule IDs to exclude them from running during the scan. Rule IDs are numbers and can be found from the DAST log or on the [ZAP project](https://github.com/zaproxy/zaproxy/blob/develop/docs/scanners.md). For example, `HTTP Parameter Override` has a rule ID of `10026`. **Note:** In earlier versions of GitLab the excluded rules were executed but alerts they generated were suppressed. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118641) in GitLab 12.10. |
| `DAST_REQUEST_HEADERS` | string | Set to a comma-separated list of request header names and values. Headers are added to every request made by DAST. For example, `Cache-control: no-cache,User-Agent: DAST/1.0` | | `DAST_REQUEST_HEADERS` | string | Set to a comma-separated list of request header names and values. Headers are added to every request made by DAST. For example, `Cache-control: no-cache,User-Agent: DAST/1.0` |
| `DAST_DEBUG` | boolean | Enable debug message output. Default: `false` | | `DAST_DEBUG` | boolean | Enable debug message output. Default: `false` |
| `DAST_SPIDER_MINS` | number | The maximum duration of the spider scan in minutes. Set to `0` for unlimited. Default: One minute, or unlimited when the scan is a full scan. | | `DAST_SPIDER_MINS` | number | The maximum duration of the spider scan in minutes. Set to `0` for unlimited. Default: One minute, or unlimited when the scan is a full scan. |
......
...@@ -433,7 +433,7 @@ apply: ...@@ -433,7 +433,7 @@ apply:
### Multiple Terraform Plan reports ### Multiple Terraform Plan reports
Starting with 13.2, you can display mutiple reports on the Merge Request page. The reports will also display the `artifacts: name:`. See example below for a suggested setup. Starting with 13.2, you can display multiple reports on the Merge Request page. The reports will also display the `artifacts: name:`. See example below for a suggested setup.
```yaml ```yaml
image: image:
......
...@@ -75,7 +75,7 @@ This view allows you to: ...@@ -75,7 +75,7 @@ This view allows you to:
### Control Container Registry for your group ### Control Container Registry for your group
Navigate to your groups's **{package}** **Packages & Registries > Container Registry**. Navigate to your group's **{package}** **Packages & Registries > Container Registry**.
![Container Registry group repositories](img/container_registry_group_repositories_v13_1.png) ![Container Registry group repositories](img/container_registry_group_repositories_v13_1.png)
......
...@@ -25,10 +25,10 @@ The following list illustrates the main differences between CVS and Git: ...@@ -25,10 +25,10 @@ The following list illustrates the main differences between CVS and Git:
are not atomic. If an operation on the repository is interrupted in the middle, are not atomic. If an operation on the repository is interrupted in the middle,
the repository can be left in an inconsistent state. the repository can be left in an inconsistent state.
- **Storage method.** Changes in CVS are per file (changeset), while in Git - **Storage method.** Changes in CVS are per file (changeset), while in Git
a committed file(s) is stored in its entirety (snapshot). That means that's a committed file(s) is stored in its entirety (snapshot). That means it's
very easy in Git to revert or undo a whole change. very easy in Git to revert or undo a whole change.
- **Revision IDs.** The fact that in CVS changes are per files, the revision ID - **Revision IDs.** The fact that in CVS changes are per files, the revision ID
is depicted by version numbers, for example `1.4` reflects how many time a is depicted by version numbers, for example `1.4` reflects how many times a
given file has been changed. In Git, each version of a project as a whole given file has been changed. In Git, each version of a project as a whole
(each commit) has its unique name given by SHA-1. (each commit) has its unique name given by SHA-1.
- **Merge tracking.** Git uses a commit-before-merge approach rather than - **Merge tracking.** Git uses a commit-before-merge approach rather than
...@@ -54,7 +54,7 @@ Wikipedia article on [comparing the different version control software](https:// ...@@ -54,7 +54,7 @@ Wikipedia article on [comparing the different version control software](https://
CVS is old with no new release since 2008. Git provides more tools to work CVS is old with no new release since 2008. Git provides more tools to work
with (`git bisect` for one) which makes for a more productive workflow. with (`git bisect` for one) which makes for a more productive workflow.
Migrating to Git/GitLab there is: Migrating to Git/GitLab will benefit you:
- **Shorter learning curve**, Git has a big community and a vast number of - **Shorter learning curve**, Git has a big community and a vast number of
tutorials to get you started (see our [Git topic](../../../topics/git/index.md)). tutorials to get you started (see our [Git topic](../../../topics/git/index.md)).
......
...@@ -53,7 +53,7 @@ Irker accepts channel names of the form `chan` and `#chan`, both for the ...@@ -53,7 +53,7 @@ Irker accepts channel names of the form `chan` and `#chan`, both for the
case, `Aorimn` is treated as a nick and no more as a channel name. case, `Aorimn` is treated as a nick and no more as a channel name.
Irker can also join password-protected channels. Users need to append Irker can also join password-protected channels. Users need to append
`?key=thesecretpassword` to the chan name. When using this feature remember to `?key=thesecretpassword` to the channel name. When using this feature remember to
**not** put the `#` sign in front of the channel name; failing to do so will **not** put the `#` sign in front of the channel name; failing to do so will
result on irker joining a channel literally named `#chan?key=password` henceforth result on irker joining a channel literally named `#chan?key=password` henceforth
leaking the channel key through the `/whois` IRC command (depending on IRC server leaking the channel key through the `/whois` IRC command (depending on IRC server
......
...@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# GitLab Jira integration # GitLab Jira integration
If you need to use Jira to track work that's implemented in GitLab, GitLab's Jira integrations make the process of working across systems more efficent. If you need to use Jira to track work that's implemented in GitLab, GitLab's Jira integrations make the process of working across systems more efficient.
This page is about the GitLab Jira integration, which is available in every GitLab project by default, allowing you to connect it to any Jira instance, whether Cloud or self-managed. To compare features with the complementary Jira Development Panel integration, see [Jira integrations](jira_integrations.md). This page is about the GitLab Jira integration, which is available in every GitLab project by default, allowing you to connect it to any Jira instance, whether Cloud or self-managed. To compare features with the complementary Jira Development Panel integration, see [Jira integrations](jira_integrations.md).
......
...@@ -82,9 +82,9 @@ Read more about [Service templates](services_templates.md). ...@@ -82,9 +82,9 @@ Read more about [Service templates](services_templates.md).
## Project integration management ## Project integration management
Project integraton management lets you control integration settings across all projects Project integration management lets you control integration settings across all projects
of an instance. On the project level, administrators you can choose whether to inherit the of an instance. On the project level, administrators you can choose whether to inherit the
instance configuraton or provide custom settings. instance configuration or provide custom settings.
Read more about [Project integration management](../../admin_area/settings/project_integration_management.md). Read more about [Project integration management](../../admin_area/settings/project_integration_management.md).
......
...@@ -69,7 +69,7 @@ For instance, consider the following workflow: ...@@ -69,7 +69,7 @@ For instance, consider the following workflow:
This example shows how to run Code Quality on your code by using GitLab CI/CD and Docker. This example shows how to run Code Quality on your code by using GitLab CI/CD and Docker.
It requires GitLab 11.11 or later, and GitLab Runner 11.5 or later. If you are using It requires GitLab 11.11 or later, and GitLab Runner 11.5 or later. If you are using
GitLab 11.4 or ealier, you can view the deprecated job definitions in the GitLab 11.4 or earlier, you can view the deprecated job definitions in the
[documentation archive](https://docs.gitlab.com/12.10/ee/user/project/merge_requests/code_quality.html#previous-job-definitions). [documentation archive](https://docs.gitlab.com/12.10/ee/user/project/merge_requests/code_quality.html#previous-job-definitions).
First, you need GitLab Runner configured: First, you need GitLab Runner configured:
...@@ -276,7 +276,7 @@ This adds SonarJava to the `plugins:` section of the [default `.codeclimate.yml` ...@@ -276,7 +276,7 @@ This adds SonarJava to the `plugins:` section of the [default `.codeclimate.yml`
included in your project. included in your project.
Changes to the `plugins:` section do not affect the `exclude_patterns` section of the Changes to the `plugins:` section do not affect the `exclude_patterns` section of the
defeault `.codeclimate.yml`. See the Code Climate documentation for default `.codeclimate.yml`. See the Code Climate documentation for
[excluding files and folders](https://docs.codeclimate.com/docs/excluding-files-and-folders) [excluding files and folders](https://docs.codeclimate.com/docs/excluding-files-and-folders)
for more details. for more details.
......
...@@ -9,7 +9,7 @@ module Gitlab ...@@ -9,7 +9,7 @@ module Gitlab
# Begins stealing jobs from the background migrations queue, blocking the # Begins stealing jobs from the background migrations queue, blocking the
# caller until all jobs have been completed. # caller until all jobs have been completed.
# #
# When a migration raises a StandardError is is going to be retries up to # When a migration raises a StandardError it is going to retry up to
# three times, for example, to recover from a deadlock. # three times, for example, to recover from a deadlock.
# #
# When Exception is being raised, it enqueues the migration again, and # When Exception is being raised, it enqueues the migration again, and
......
...@@ -1648,7 +1648,7 @@ RSpec.describe User do ...@@ -1648,7 +1648,7 @@ RSpec.describe User do
# add user to project # add user to project
project.add_maintainer(user) project.add_maintainer(user)
# create invite to projet # create invite to project
create(:project_member, :developer, project: project, invite_token: '1234', invite_email: 'inviteduser1@example.com') create(:project_member, :developer, project: project, invite_token: '1234', invite_email: 'inviteduser1@example.com')
# create request to join project # create request to join project
......
...@@ -69,7 +69,7 @@ RSpec.describe Jira::Requests::Projects::ListService do ...@@ -69,7 +69,7 @@ RSpec.describe Jira::Requests::Projects::ListService do
expect(client).to receive(:get).and_return([{ 'key' => 'pr1', 'name' => 'First Project' }, { 'key' => 'pr2', 'name' => 'Second Project' }]) expect(client).to receive(:get).and_return([{ 'key' => 'pr1', 'name' => 'First Project' }, { 'key' => 'pr2', 'name' => 'Second Project' }])
end end
it 'returns a paylod with Jira projets' do it 'returns a paylod with Jira projects' do
payload = subject.payload payload = subject.payload
expect(subject.success?).to be_truthy expect(subject.success?).to be_truthy
...@@ -80,7 +80,7 @@ RSpec.describe Jira::Requests::Projects::ListService do ...@@ -80,7 +80,7 @@ RSpec.describe Jira::Requests::Projects::ListService do
context 'when filtering projects by name' do context 'when filtering projects by name' do
let(:params) { { query: 'first' } } let(:params) { { query: 'first' } }
it 'returns a paylod with Jira projets' do it 'returns a paylod with Jira procjets' do
payload = subject.payload payload = subject.payload
expect(subject.success?).to be_truthy expect(subject.success?).to be_truthy
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment