diff options
| author | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-07-02 20:08:00 +0300 |
|---|---|---|
| committer | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-07-02 20:08:00 +0300 |
| commit | 99c80156ae6058f70fde77baabd5f007f0246e6d (patch) | |
| tree | b5a319850203ae8d9d2d7401386f608c2026b092 /doc/user | |
| parent | 192ac02d9225df9a9df3cf301e25582f5b827e28 (diff) | |
| parent | ed4675c66c3764f24b02a4479187764ea840f64c (diff) | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 14995-custom_wiki_sidebar
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/integrations/bamboo.md | 3 | ||||
| -rw-r--r-- | doc/user/project/settings/import_export.md | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md index 1e28646bc97..cffe456cbc2 100644 --- a/doc/user/project/integrations/bamboo.md +++ b/doc/user/project/integrations/bamboo.md @@ -41,8 +41,7 @@ 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 a short, - all capital letter, identifier that is unique. It will be something like PR-BLD +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. 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. diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index 9034a9b5179..f94671fcf87 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -32,7 +32,8 @@ with all their related data and be moved into a new GitLab instance. | GitLab version | Import/Export version | | ---------------- | --------------------- | -| 10.8 to current | 0.2.3 | +| 11.1 to current | 0.2.4 | +| 10.8 | 0.2.3 | | 10.4 | 0.2.2 | | 10.3 | 0.2.1 | | 10.0 | 0.2.0 | |