diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-23 11:54:44 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-23 11:54:44 +0300 |
| commit | bbaa0fccfab36c6a58265e944f390bcd73b0f974 (patch) | |
| tree | d5c56e5f47c4ad7923c912565307259bb3d2b96f /Gemfile.lock | |
| parent | 5f7f35e8fe9b921f599aba29406947720959f4fa (diff) | |
| download | gitlab-ce-bbaa0fccfab36c6a58265e944f390bcd73b0f974.tar.gz | |
Update poltergeist and should-matchers
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 18fdd7acc42..f7bd28ff478 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,16 +12,6 @@ GIT specs: raphael-rails (2.1.0) -GIT - remote: https://github.com/jonleighton/poltergeist.git - revision: 9645b52009e258921b860d3b7601d00008b22c45 - ref: 9645b52009e258921b860d3b7601d00008b22c45 - specs: - poltergeist (1.1.0) - capybara (~> 2.0, >= 2.0.1) - faye-websocket (~> 0.4, >= 0.4.4) - http_parser.rb (~> 0.5.3) - GEM remote: https://rubygems.org/ specs: @@ -103,7 +93,7 @@ GEM thor crack (0.3.2) daemons (1.1.9) - database_cleaner (0.9.1) + database_cleaner (1.0.1) debug_inspector (0.0.2) descendants_tracker (0.0.1) devise (2.2.4) @@ -203,7 +193,7 @@ GEM lumberjack (>= 1.0.2) pry (>= 0.9.10) thor (>= 0.14.6) - guard-rspec (2.6.0) + guard-rspec (3.0.0) guard (>= 1.8) rspec (~> 2.13) guard-spinach (0.0.2) @@ -246,7 +236,7 @@ GEM letter_opener (1.1.0) launchy (~> 2.2.0) libv8 (3.11.8.17) - listen (1.0.3) + listen (1.1.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) @@ -293,9 +283,13 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.4.0) pg (0.15.1) + poltergeist (1.3.0) + capybara (~> 2.1.0) + faye-websocket (>= 0.4.4, < 0.5.0) + http_parser.rb (~> 0.5.3) polyglot (0.3.3) posix-spawn (0.3.6) - pry (0.9.12.1) + pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) @@ -414,7 +408,7 @@ GEM thor (~> 0.14) settingslogic (2.0.9) sexp_processor (4.2.1) - shoulda-matchers (1.3.0) + shoulda-matchers (2.1.0) activesupport (>= 3.0.0) sidekiq (2.12.0) celluloid (>= 0.14.0) @@ -435,7 +429,7 @@ GEM slim (1.3.8) temple (~> 0.6.3) tilt (~> 1.3.3) - slop (3.4.4) + slop (3.4.5) spinach (0.8.2) colorize (= 0.5.8) gherkin-ruby (~> 0.3.0) @@ -554,7 +548,7 @@ DEPENDENCIES omniauth-google-oauth2 omniauth-twitter pg - poltergeist! + poltergeist (~> 1.3.0) pry puma (~> 2.0.1) quiet_assets (~> 1.0.1) @@ -573,7 +567,7 @@ DEPENDENCIES seed-fu select2-rails settingslogic - shoulda-matchers (= 1.3.0) + shoulda-matchers (~> 2.1.0) sidekiq simplecov sinatra |