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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 71936584d6e..8ab1e3d7683 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM ast (>= 1.1, < 3.0) pg (0.15.1) phantomjs (1.9.2.0) - poltergeist (1.5.1) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -650,7 +650,9 @@ GEM webmock (1.16.0) addressable (>= 2.2.7) crack (>= 0.3.2) - websocket-driver (0.3.3) + websocket-driver (0.5.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) wikicloth (0.8.1) builder expression_parser @@ -744,7 +746,7 @@ DEPENDENCIES omniauth-twitter org-ruby (= 0.9.12) pg - poltergeist (~> 1.5.1) + poltergeist (~> 1.6.0) pry-rails quiet_assets (~> 1.0.1) rack-attack |