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
This commit is contained in:
commit
012411817b
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 7.10.0 (unreleased)
|
v 7.10.0 (unreleased)
|
||||||
|
- Update poltergeist to version 1.6.0 to support PhantomJS 2.0 (Zeger-Jan van de Weg)
|
||||||
- enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
|
- enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
|
||||||
- extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger)
|
- extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger)
|
||||||
- Add a service to support external wikis (Hannes Rosenögger)
|
- Add a service to support external wikis (Hannes Rosenögger)
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -252,7 +252,7 @@ group :development, :test do
|
||||||
gem 'rb-inotify', require: linux_only('rb-inotify')
|
gem 'rb-inotify', require: linux_only('rb-inotify')
|
||||||
|
|
||||||
# PhantomJS driver for Capybara
|
# PhantomJS driver for Capybara
|
||||||
gem 'poltergeist', '~> 1.5.1'
|
gem 'poltergeist', '~> 1.6.0'
|
||||||
|
|
||||||
gem 'jasmine', '2.0.2'
|
gem 'jasmine', '2.0.2'
|
||||||
|
|
||||||
|
|
|
@ -392,7 +392,7 @@ GEM
|
||||||
ast (>= 1.1, < 3.0)
|
ast (>= 1.1, < 3.0)
|
||||||
pg (0.15.1)
|
pg (0.15.1)
|
||||||
phantomjs (1.9.2.0)
|
phantomjs (1.9.2.0)
|
||||||
poltergeist (1.5.1)
|
poltergeist (1.6.0)
|
||||||
capybara (~> 2.1)
|
capybara (~> 2.1)
|
||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
@ -650,7 +650,9 @@ GEM
|
||||||
webmock (1.16.0)
|
webmock (1.16.0)
|
||||||
addressable (>= 2.2.7)
|
addressable (>= 2.2.7)
|
||||||
crack (>= 0.3.2)
|
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)
|
wikicloth (0.8.1)
|
||||||
builder
|
builder
|
||||||
expression_parser
|
expression_parser
|
||||||
|
@ -744,7 +746,7 @@ DEPENDENCIES
|
||||||
omniauth-twitter
|
omniauth-twitter
|
||||||
org-ruby (= 0.9.12)
|
org-ruby (= 0.9.12)
|
||||||
pg
|
pg
|
||||||
poltergeist (~> 1.5.1)
|
poltergeist (~> 1.6.0)
|
||||||
pry-rails
|
pry-rails
|
||||||
quiet_assets (~> 1.0.1)
|
quiet_assets (~> 1.0.1)
|
||||||
rack-attack
|
rack-attack
|
||||||
|
|
Loading…
Reference in New Issue