diff --git a/Gemfile b/Gemfile index 21397aa..831a443 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ end group :test do gem 'factory_girl_rails' gem 'shoulda-matchers' - gem 'poltergeist', git: 'git://github.com/jonleighton/poltergeist.git' + gem 'poltergeist' gem 'fivemat' gem 'capybara-screenshot' end @@ -64,9 +64,9 @@ group :production do gem 'thin' end -gem "newrelic_rpm" +gem 'newrelic_rpm' -gem "exception_notification", :git => "git://github.com/rails/exception_notification", :require => 'exception_notifier' +gem 'exception_notification', :git => 'git://github.com/rails/exception_notification', :require => 'exception_notifier' gem 'pg' gem 'devise' gem 'simple_form' diff --git a/Gemfile.lock b/Gemfile.lock index a6a16b4..250f54d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,16 +5,6 @@ GIT specs: yaml_db (0.2.3) -GIT - remote: git://github.com/jonleighton/poltergeist.git - revision: 330fe1d01eb9c7e25ba4154bfc7dc84aac58ed29 - specs: - poltergeist (1.5.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - GIT remote: git://github.com/rails/exception_notification revision: 192a49a02d63d28b23ed41cebadfedd490929cf1 @@ -138,6 +128,11 @@ GEM cocaine (~> 0.5.3) mime-types pg (0.17.1) + poltergeist (1.5.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) polyamorous (0.6.4) activerecord (>= 3.0) polyglot (0.3.4) @@ -250,7 +245,7 @@ DEPENDENCIES newrelic_rpm paperclip pg - poltergeist! + poltergeist powder pry rails (~> 4.0.0)