summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-07 15:03:55 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-03-07 15:03:55 -0500
commitf05c22295dbaa7eef769a232545ead6bb1d6c08e (patch)
tree332fb7bb8986fa74516a5c74032c6be2341853e7
parent903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4 (diff)
downloadgitlab-ce-rs-bump-poltergeist.tar.gz
Bump poltergeist to `~> 1.9.0`rs-bump-poltergeist
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c66ef3cffad..62b2e55b537 100644
--- a/Gemfile
+++ b/Gemfile
@@ -273,7 +273,7 @@ group :development, :test do
gem 'capybara', '~> 2.4.0'
gem 'capybara-screenshot', '~> 1.0.0'
- gem 'poltergeist', '~> 1.8.1'
+ gem 'poltergeist', '~> 1.9.0'
gem 'teaspoon', '~> 1.0.0'
gem 'teaspoon-jasmine', '~> 2.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 22c86e4ae8f..cc5e16c37d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -552,7 +552,7 @@ GEM
parser (2.2.3.0)
ast (>= 1.1, < 3.0)
pg (0.18.4)
- poltergeist (1.8.1)
+ poltergeist (1.9.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
@@ -978,7 +978,7 @@ DEPENDENCIES
org-ruby (~> 0.9.12)
paranoia (~> 2.0)
pg (~> 0.18.2)
- poltergeist (~> 1.8.1)
+ poltergeist (~> 1.9.0)
pry-rails
quiet_assets (~> 1.0.2)
rack-attack (~> 4.3.1)