diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-12 21:44:07 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-12 21:44:07 +0000 |
commit | 21e3712a07987f0a58282daf58f3e6aa66dd68fc (patch) | |
tree | f5c0a634b5cbf8769a218127bda222dca58b8697 /.gitlab-ci.yml | |
parent | cf47c0417bb2c6cb8f9017862f237d0968e459dc (diff) | |
parent | abfb4f6e32ac13929678039e324307ee3ef2af43 (diff) | |
download | gitlab-ce-21e3712a07987f0a58282daf58f3e6aa66dd68fc.tar.gz |
Merge branch 'es6-es5-poltergeist' into 'master'
Document Capybara errors from es6 in es5 file.
## What does this MR do?
Documents an error that I've banged my head against twice now.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The greater good.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !6836
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions