diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-15 12:40:38 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-15 12:40:38 +0000 |
| commit | 6af598fc173bd0f7cd4237fa3e60d223103301a3 (patch) | |
| tree | b88b54062dc8ed502638118eac77319d96801f69 /lib | |
| parent | 20f9b8be2fa53034aa867882cdcd4ccd2f019d29 (diff) | |
| parent | 501a7e89978a03e7e10f497c5ad0d4f87319dbe5 (diff) | |
| download | gitlab-ce-6af598fc173bd0f7cd4237fa3e60d223103301a3.tar.gz | |
Merge branch 'new-phantomjs-version' into 'master'
Use new PhantomJS version
## What does this MR do?
Makes CI builds to use PhantomJS 2.1.1.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5740
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions