diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-11-22 12:46:01 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-11-22 12:46:01 +0300 |
| commit | 22cefb2f7fa65ef9029d348c5e83fc01d5d7b643 (patch) | |
| tree | c3af398a07487e49dde501a80235f22f7c77e9a7 | |
| parent | a64b9f0a31e7e8ae6235f1926245e9260f5991fd (diff) | |
| parent | 6e196d9471b5ca9e19b8ae88152c0edaf98ffd4b (diff) | |
Merge branch 'update-12-5-for-release-12-5' into '12.5'
Update 12.5 dropdown to match that of 12.5
See merge request gitlab-org/gitlab-docs!624
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b21b1c08..0860780c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,10 +12,10 @@ stages: # Pick the remote branch, by default master (see the Rakefile for more info) # variables: - BRANCH_EE: 'master' - BRANCH_OMNIBUS: 'master' - BRANCH_RUNNER: 'master' - BRANCH_CHARTS: 'master' + BRANCH_EE: '12-5-stable-ee' + BRANCH_OMNIBUS: '12-5-stable' + BRANCH_RUNNER: '12-5-stable' + BRANCH_CHARTS: '2-5-stable' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 57cd8a77..24c83802 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -1,11 +1,12 @@ # The first online version should always point to the # current stable version. online: + - "12.5" - "12.4" - "12.3" - - "12.2" offline: + - "12.2" - "12.1" - "12.0" - "11.11" |