diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-04-30 20:25:06 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-04-30 20:25:06 -0400 |
commit | fc724398cf0dab032e3c38020df08a3ef000c110 (patch) | |
tree | ce1a504381cf26ed587013e7666f7c51faa15879 | |
parent | e4160fab67800598e1d005eb9c280a307be594b0 (diff) | |
download | gitlab-ce-rs-update-poltergeist.tar.gz |
Bump poltergeist 1.9.0 -> 1.14.0rs-update-poltergeist
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 7 |
2 files changed, 4 insertions, 5 deletions
@@ -303,7 +303,7 @@ group :development, :test do gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' + gem 'poltergeist', '~> 1.14.0' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index 038d1f746b3..ee33706a3bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -527,10 +527,9 @@ GEM ast (~> 2.2) path_expander (1.0.1) pg (0.18.4) - poltergeist (1.9.0) + poltergeist (1.14.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) @@ -831,7 +830,7 @@ GEM hashdiff webpack-rails (0.9.10) railties (>= 3.2.0) - websocket-driver (0.6.3) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -966,7 +965,7 @@ DEPENDENCIES org-ruby (~> 0.9.12) paranoia (~> 2.2) pg (~> 0.18.2) - poltergeist (~> 1.9.0) + poltergeist (~> 1.14.0) premailer-rails (~> 1.9.0) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) |