diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 21:12:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 21:12:08 +0000 |
| commit | 012411817b277e0115378288150c1044fb712741 (patch) | |
| tree | 3036d20ec627bd96d9ffdc6d14fe66ad77e371cd /Gemfile | |
| parent | 14846c044abb7c8b5230a6df9d5475728249f7e5 (diff) | |
| parent | d70126c1fbc65c4feeea6fb45424f5d4a30bb797 (diff) | |
| download | gitlab-ce-012411817b277e0115378288150c1044fb712741.tar.gz | |
Merge branch 'version-bump-poltergeist' into 'master'
Update poltergeist to support phantomjs 2.0
In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).
Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.
See merge request !403
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -252,7 +252,7 @@ group :development, :test do gem 'rb-inotify', require: linux_only('rb-inotify') # PhantomJS driver for Capybara - gem 'poltergeist', '~> 1.5.1' + gem 'poltergeist', '~> 1.6.0' gem 'jasmine', '2.0.2' |