diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 18:56:05 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 18:56:05 -0700 |
| commit | d5a259d43ecf6713b443da25b2d765580b8f7e42 (patch) | |
| tree | 7630e64d15a6472048cd0aae180aaabcd5168467 /Gemfile.lock | |
| parent | 915c7b94558170683570f43aa6cb4dcd9fd7f936 (diff) | |
| download | gitlab-ce-d5a259d43ecf6713b443da25b2d765580b8f7e42.tar.gz | |
Revert "Update poltergeist to support phantomjs 2.0"
This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8ab1e3d7683..71936584d6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM ast (>= 1.1, < 3.0) pg (0.15.1) phantomjs (1.9.2.0) - poltergeist (1.6.0) + poltergeist (1.5.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -650,9 +650,7 @@ GEM webmock (1.16.0) addressable (>= 2.2.7) crack (>= 0.3.2) - websocket-driver (0.5.3) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-driver (0.3.3) wikicloth (0.8.1) builder expression_parser @@ -746,7 +744,7 @@ DEPENDENCIES omniauth-twitter org-ruby (= 0.9.12) pg - poltergeist (~> 1.6.0) + poltergeist (~> 1.5.1) pry-rails quiet_assets (~> 1.0.1) rack-attack |