summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-06-03 16:48:59 +0300
committerValery Sizov <vsv2711@gmail.com>2015-06-03 16:48:59 +0300
commit27a3fe8b98798861dc637b2642de24af3ea12d24 (patch)
tree17f6ea6eeee915d814709341fb2eef0b5c37723d
parent767e516d142440e67bbe73d4c4c00b13bba3e919 (diff)
downloadgitlab-ci-27a3fe8b98798861dc637b2642de24af3ea12d24.tar.gz
text corrections
-rw-r--r--app/views/shared/_guide.html.haml2
-rw-r--r--doc/builds_configuration/README.md16
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/shared/_guide.html.haml b/app/views/shared/_guide.html.haml
index d34a1be..0b47f7e 100644
--- a/app/views/shared/_guide.html.haml
+++ b/app/views/shared/_guide.html.haml
@@ -6,7 +6,7 @@
Add at least one runner to the project.
Go to #{link_to 'Runners page', project_runners_path(@project), target: :blank} for instructions.
%li
- Put the .gitlab-ci.yml to the root of your repository. Examples can be found in #{link_to "Configuraton of your builds with .gitlab-ci.yaml", "http://doc.gitlab.com/ci/builds_configuration/README.html", target: :blank}
+ Put the .gitlab-ci.yml in the root of your repository. Examples can be found in #{link_to "Configuraton of your builds with .gitlab-ci.yaml", "http://doc.gitlab.com/ci/builds_configuration/README.html", target: :blank}
%li
Visit #{link_to 'GitLab project settings', @project.gitlab_url + "/services/gitlab_ci/edit", target: :blank}
and press the "Test settings" button.
diff --git a/doc/builds_configuration/README.md b/doc/builds_configuration/README.md
index 08841d9..9e761bf 100644
--- a/doc/builds_configuration/README.md
+++ b/doc/builds_configuration/README.md
@@ -1,6 +1,6 @@
## Configuraton of your builds with .gitlab-ci.yaml
-Sinse 7.12 version GitLab CI uses special yaml file for configuration your builds. This yaml file should be placed in the root of your repository and should be named as .gitlab-ci.yml. This file contains 4 main sections: skep_refs, before_script, jobs and deploy_jobs. Example of configuration file:
+From version 7.12, GitLab CI uses a .gitlab-ci.yml file for the configuration of your builds. It is place in the root of your repository and contains four main sections: skep_refs, before_script, jobs and deploy_jobs. Here is an example of how it looks:
```
skip_refs: staging
@@ -23,7 +23,7 @@ deploy_jobs:
Let's have a close look at each section.
### skip_refs
-This parameter defines ref or list of refs to skip. You can use glob pattern syntax as well. Example: "staging,feature-*"
+This parameter defines the ref or list of refs to skip. You can use glob pattern syntax as well. Example: "staging,feature-*"
### jobs
Here you can specify parameters of your builds. There are serveral ways you can configure it. Using hash:
@@ -41,21 +41,21 @@ jobs:
bundle updata
bundle exec rspec
```
-you can also fill commands like array:
+you can also fill commands like an array:
```
- script:
- bundle update
- bundle exec rspec
```
-And there is one more way to specify build configuration, using string:
+And there is one more way to specify build configuration, using a string:
```
jobs:
- bundle exec rspec
```
-In this way, name of build will be taken from this command line.
+In this way, the name of the build will be taken from command line.
## deploy_jobs
-Deploy Jobs define the builds that will be run when all job succedded. Define using hash:
+Deploy Jobs that will be run when all other jobs have succeeded. Define them using a hash:
```
deploy_jobs:
@@ -69,7 +69,7 @@ deploy_jobs:
`script` can be a multiline script or array like for regular jobs.
-You can also define deploy jobs with string:
+You can also define deploy jobs with a string:
```
deploy_jobs:
@@ -77,4 +77,4 @@ deploy_jobs:
```
## before_script
-This section is used for defining command that should be run before all builds, including deploy builds. Can be an array or multiline string. \ No newline at end of file
+`before_script` is used to define the command that should be ran before all builds, including deploy builds. This can be an array or a multiline string. \ No newline at end of file