diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-09 16:15:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-09 16:15:34 +0000 |
| commit | e72ae40c95e170a6f7465ffffee1a3ad93be049a (patch) | |
| tree | 47c885bc14effcf2b6638019107794f6566bbc59 | |
| parent | 5956ddd8b2a633bd9ff1664bcad74e2d17eeebd0 (diff) | |
| parent | f05c22295dbaa7eef769a232545ead6bb1d6c08e (diff) | |
| download | gitlab-ce-e72ae40c95e170a6f7465ffffee1a3ad93be049a.tar.gz | |
Merge branch 'rs-bump-poltergeist' into 'master'
Bump poltergeist to `~> 1.9.0`
See merge request !3116
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -275,7 +275,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 dcfef4cd6b9..432bdc344ad 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) @@ -982,7 +982,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) |