summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-12 09:47:49 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-12 09:47:49 +0000
commitb2828d4145ac01468a59b821ced29dd248526089 (patch)
tree91223b5de622e0c514db8db0183bdc8585625649 /.gitlab-ci.yml
parent0f6ed843b20ed64d25ee5fda7243611f3654e43e (diff)
parent7d65d2ec2b808a796efdada83cd0ec3613ca693b (diff)
downloadgitlab-ce-b2828d4145ac01468a59b821ced29dd248526089.tar.gz
Merge branch 'update-performance-guide' into 'master'
Corrected links/usernames in performance guide ## What does this MR do? This fixes two broken links in the performance guide and removes the mention of Josh as he no longer works for GitLab. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The guide contained two broken links, and Josh no longer works for GitLab. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5772
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions