Commit 191dad29 authored by Dan Doran's avatar Dan Doran Committed by Rémy Coutable

Fixed two typos and adjusted one instance of punctuation according to the...

Fixed two typos and adjusted one instance of punctuation according to the grammar rule for appositive commas

Originally submitted at
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6419.
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent e6128cdc
...@@ -143,7 +143,7 @@ In the next section we'll break down the pipeline and explain what each job does ...@@ -143,7 +143,7 @@ In the next section we'll break down the pipeline and explain what each job does
By now you should see the pipeline running, but what is it running exactly? By now you should see the pipeline running, but what is it running exactly?
To navigate inside the pipeline, click its status badge. (It's status should be "running"). To navigate inside the pipeline, click its status badge. (Its status should be "running").
The pipeline is split into 4 stages, each running a couple of jobs. The pipeline is split into 4 stages, each running a couple of jobs.
![Pipeline stages](img/guide_pipeline_stages.png) ![Pipeline stages](img/guide_pipeline_stages.png)
...@@ -194,7 +194,7 @@ applications. In the rightmost column for the production environment, you can ma ...@@ -194,7 +194,7 @@ applications. In the rightmost column for the production environment, you can ma
- The first icon will open the URL of the application that is deployed in - The first icon will open the URL of the application that is deployed in
production. It's a very simple page, but the important part is that it works! production. It's a very simple page, but the important part is that it works!
- The next icon with the small graph will take you to the metrics page where - The next icon, with the small graph, will take you to the metrics page where
Prometheus collects data about the Kubernetes cluster and how the application Prometheus collects data about the Kubernetes cluster and how the application
affects it (in terms of memory/CPU usage, latency, etc.). affects it (in terms of memory/CPU usage, latency, etc.).
...@@ -217,7 +217,7 @@ under **Settings > CI/CD > Variables**. ...@@ -217,7 +217,7 @@ under **Settings > CI/CD > Variables**.
### Working with branches ### Working with branches
Following the [GitLab flow](../../workflow/gitlab_flow.md#working-with-feature-branches) Following the [GitLab flow](../../workflow/gitlab_flow.md#working-with-feature-branches),
let's create a feature branch that will add some content to the application. let's create a feature branch that will add some content to the application.
Under your repository, navigate to the following file: `app/views/welcome/index.html.erb`. Under your repository, navigate to the following file: `app/views/welcome/index.html.erb`.
...@@ -235,7 +235,7 @@ by clicking **Commit**. ...@@ -235,7 +235,7 @@ by clicking **Commit**.
![Web IDE commit](img/guide_ide_commit.png) ![Web IDE commit](img/guide_ide_commit.png)
Once you submit the merge request, you'll see the pipeline running. This will Once you submit the merge request, you'll see the pipeline running. This will
run all the jobs as [described previously](#deploying-the-application), as well run all the jobs as [described previously](#deploying-the-application), as well as
a few more that run only on branches other than `master`. a few more that run only on branches other than `master`.
![Merge request](img/guide_merge_request.png) ![Merge request](img/guide_merge_request.png)
...@@ -278,7 +278,7 @@ and the application will be eventually deployed straight to production. ...@@ -278,7 +278,7 @@ and the application will be eventually deployed straight to production.
After implementing this project, you should now have a solid understanding of the basics of Auto DevOps. After implementing this project, you should now have a solid understanding of the basics of Auto DevOps.
We started from building and testing to deploying and monitoring an application We started from building and testing to deploying and monitoring an application
all within GitLab. Despite its automatic nature, Audo DevOps can also be configured all within GitLab. Despite its automatic nature, Auto DevOps can also be configured
and customized to fit your workflow. Here are some helpful resources for further reading: and customized to fit your workflow. Here are some helpful resources for further reading:
1. [Auto DevOps](index.md) 1. [Auto DevOps](index.md)
......
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