Commit 3cd63834 authored by Gabriel Yoachum's avatar Gabriel Yoachum Committed by Amy Qualls

Revisions for tone and style

Word wraps, and rephrase for GitLab style. Also, fix one vale issue
earlier in the document.
parent 473c0b29
...@@ -50,7 +50,7 @@ service in GitLab. ...@@ -50,7 +50,7 @@ service in GitLab.
1. Enter the build key from your Bamboo build plan. Build keys are typically made 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 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 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 uppercase identifier that is unique. When viewing a plan in Bamboo, the
build key is also shown in the browser URL, for example `https://bamboo.example.com/browse/PROJ-PLAN`. 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 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 access to trigger the build plan. Leave these fields blank if you do not require
...@@ -60,8 +60,12 @@ service in GitLab. ...@@ -60,8 +60,12 @@ service in GitLab.
## Troubleshooting ## Troubleshooting
### Builds not triggered
If builds are not triggered, ensure you entered the right GitLab IP address in If builds are not triggered, ensure you entered the right GitLab IP address in
Bamboo under 'Trigger IP addresses'. Also check [service hook logs](overview.md#troubleshooting-integrations) for request failures. Bamboo under 'Trigger IP addresses'. Also check [service hook logs](overview.md#troubleshooting-integrations) for request failures.
NOTE: ### Advanced Atlassian Bamboo features not available in GitLab UI
Starting with GitLab 8.14.0, builds are triggered on push events.
Advanced Atlassian Bamboo features are not compatible with GitLab. These features
include, but are not limited to, the ability to watch the build logs from the GitLab UI.
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