Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-07-03 12:31:23 +0300
committerMarcia Ramos <virtua.creative@gmail.com>2018-07-03 12:31:23 +0300
commitd285356e94a45bfd9bb2e7ca8b4c07562d44fe76 (patch)
tree3c9a0f42383bce2d94cc7eb711f8ef77b2f065ea
parent516a15f5f4b1d4c1b2ce7ffb975f433fae3f7d7f (diff)
parent786ea598db2abf01cb23887f65fd4289bc3f227c (diff)
Merge branch 'docs/bamboo' into 'master'
Copyedit Bamboo integration docs See merge request gitlab-org/gitlab-ce!20312
-rw-r--r--doc/user/project/integrations/bamboo.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md
index cffe456cbc2..9b18eb15599 100644
--- a/doc/user/project/integrations/bamboo.md
+++ b/doc/user/project/integrations/bamboo.md
@@ -41,7 +41,11 @@ service in GitLab.
1. Click 'Atlassian Bamboo CI'
1. Select the 'Active' checkbox.
1. Enter the base URL of your Bamboo server. 'https://bamboo.example.com'
-1. Enter the build key from your Bamboo build plan. Build keys are typically made up from the Project Key and Plan Key that are set on project/plan creation and seperated with a '-' for example **PROJ-PLAN**. This is a short, all capital letter, identifier that is unique. When viewing a plan within Bamboo, the build key is also shown in the browser URL for example https://bamboo.example.com/browse/PROJ-PLAN
+1. Enter the build key from your Bamboo build plan. Build keys are typically made
+ up from the Project Key and Plan Key that are set on project/plan creation and
+ separated with a dash (`-`), for example **PROJ-PLAN**. This is a short, all
+ uppercase identifier that is unique. When viewing a plan within Bamboo, the
+ build key is also shown in the browser URL, for example `https://bamboo.example.com/browse/PROJ-PLAN`.
1. If necessary, enter username and password for a Bamboo user that has
access to trigger the build plan. Leave these fields blank if you do not require
authentication.