Skip to content
Snippets Groups Projects
Verified Commit 109cfd95 authored by Marcel Amirault's avatar Marcel Amirault Committed by Achilleas Pipinellis
Browse files

Correct grammar (setup to set-up) in Docs

parent a4a7c531
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Showing
with 14 additions and 14 deletions
Loading
Loading
@@ -83,7 +83,7 @@ git diff origin/7-7-stable:config/gitlab.yml.example origin/7-8-stable:config/gi
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your settings.
* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
#### Setup time zone (optional)
#### Set up time zone (optional)
 
Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 
Loading
Loading
Loading
Loading
@@ -85,7 +85,7 @@ git diff origin/7-8-stable:config/gitlab.yml.example origin/7-9-stable:config/gi
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your settings.
* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
#### Setup time zone (optional)
#### Set up time zone (optional)
 
Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 
Loading
Loading
Loading
Loading
@@ -81,7 +81,7 @@ git diff origin/7-9-stable:config/gitlab.yml.example origin/7-10-stable:config/g
* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your settings.
* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
#### Setup time zone (optional)
#### Set up time zone (optional)
 
Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 
Loading
Loading
Loading
Loading
@@ -69,7 +69,7 @@ of recovery codes.
1. Go to **Account**.
1. Click **Enable Two-Factor Authentication**.
1. Plug in your U2F device.
1. Click on **Setup New U2F Device**.
1. Click on **Set up New U2F Device**.
1. A light will start blinking on your device. Activate it by pressing its button.
 
You will see a message indicating that your device was successfully set up.
Loading
Loading
Loading
Loading
@@ -245,7 +245,7 @@ This will run mitmproxy on port `9000`. In another window, run:
curl --proxy http://localhost:9000 https://httpbin.org/status/200
```
 
If everything is setup correctly, you will see information on the mitmproxy window and
If everything is set up correctly, you will see information on the mitmproxy window and
no errors from the curl commands.
 
#### Running the Docker daemon with a proxy
Loading
Loading
Loading
Loading
@@ -15,7 +15,7 @@ See also [the Hangouts Chat documentation for configuring incoming webhooks](htt
 
## On GitLab
 
When you have the **Webhook URL** for your Hangouts Chat room webhook, you can setup the GitLab service.
When you have the **Webhook URL** for your Hangouts Chat room webhook, you can set up the GitLab service.
 
1. Navigate to the [Integrations page](project_services.md#accessing-the-project-services) in your project's settings, i.e. **Project > Settings > Integrations**.
1. Select the **Hangouts Chat** project service to configure it.
Loading
Loading
Loading
Loading
@@ -49,7 +49,7 @@ We have split this stage in steps so it is easier to follow.
 
1. The next step is to create a new user (e.g., `gitlab`) who has write access
to projects in JIRA. Enter the user's name and a _valid_ e-mail address
since JIRA sends a verification e-mail to set-up the password.
since JIRA sends a verification e-mail to set up the password.
_**Note:** JIRA creates the username automatically by using the e-mail
prefix. You can change it later if you want._
 
Loading
Loading
Loading
Loading
@@ -38,7 +38,7 @@ At the end, fill in your Mattermost details:
 
| Field | Description |
| ----- | ----------- |
| **Webhook** | The incoming webhook URL which you have to setup on Mattermost, it will be something like: http://mattermost.example/hooks/5xo… |
| **Webhook** | The incoming webhook URL which you have to set up on Mattermost, it will be something like: http://mattermost.example/hooks/5xo… |
| **Username** | Optional username which can be on messages sent to Mattermost. Fill this in if you want to change the username of the bot. |
| **Notify only broken pipelines** | If you choose to enable the **Pipeline** event and you want to be only notified about failed pipelines. |
 
Loading
Loading
Loading
Loading
@@ -102,7 +102,7 @@ in a new slash command.
 
![Mattermost add command configuration](img/mattermost_slash_command_configuration.png)
 
1. After you setup all the values, copy the token (we will use it below) and
1. After you set up all the values, copy the token (we will use it below) and
click **Done**.
 
![Mattermost slash command token](img/mattermost_slash_command_token.png)
Loading
Loading
Loading
Loading
@@ -25,7 +25,7 @@ At the end fill in your Microsoft Teams details:
 
| Field | Description |
| ----- | ----------- |
| **Webhook** | The incoming webhook URL which you have to setup on Microsoft Teams. |
| **Webhook** | The incoming webhook URL which you have to set up on Microsoft Teams. |
| **Notify only broken pipelines** | If you choose to enable the **Pipeline** event and you want to be only notified about failed pipelines. |
 
After you are all done, click **Save changes** for the changes to take effect.
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@
 
**NB: This service is only listed if you are in a development environment!**
 
To setup the mock CI service server, respond to the following endpoints
To set up the mock CI service server, respond to the following endpoints
 
- `commit_status`: `#{project.namespace.path}/#{project.path}/status/#{sha}.json`
- Have your service return `200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success_with_warnings'|'skipped'|'not_found'] }`
Loading
Loading
Loading
Loading
@@ -8,7 +8,7 @@ within the GitLab interface.
 
![Environment Dashboard](img/prometheus_dashboard.png)
 
There are two ways to setup Prometheus integration, depending on where your apps are running:
There are two ways to set up Prometheus integration, depending on where your apps are running:
* For deployments on Kubernetes, GitLab can automatically [deploy and manage Prometheus](#managed-prometheus-on-kubernetes)
* For other deployment targets, simply [specify the Prometheus server](#manual-configuration-of-prometheus).
 
Loading
Loading
Loading
Loading
@@ -69,7 +69,7 @@ Learn more on the [Time Tracking documentation](../../../workflow/time_tracking.
#### 6. Due date
 
When you work on a tight schedule, and it's important to
have a way to setup a deadline for implementations and for solving
have a way to set up a deadline for implementations and for solving
problems. This can be facilitated by the [due date](due_dates.md)). Due dates
can be changed as many times as needed.
 
Loading
Loading
Loading
Loading
@@ -54,7 +54,7 @@ to offload local hard disk R/W operations, and free up disk space significantly.
GitLab is tightly integrated with `Fog`, so you can refer to its [documentation](http://fog.io/about/provider_documentation.html)
to check which storage services can be integrated with GitLab.
You can also use external object storage in a private local network. For example,
[Minio](https://www.minio.io/) is a standalone object storage service, is easy to setup, and works well with GitLab instances.
[Minio](https://www.minio.io/) is a standalone object storage service, is easy to set up, and works well with GitLab instances.
 
GitLab provides two different options for the uploading mechanism: "Direct upload" and "Background upload".
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment