summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
2 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 41c2dcfd76e..174df13072b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)