From 2ca2d5327377419005d58bf543eb6455307f66c4 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 12 Nov 2014 16:17:16 +1100 Subject: [PATCH] Do not include perftools gem by default - it breaks Travis --- Gemfile | 4 +++- Gemfile.lock | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2e03d65a35..4fec11abeb 100644 --- a/Gemfile +++ b/Gemfile @@ -91,7 +91,9 @@ end group :test do gem 'webmock' - gem 'perftools.rb' + + # See spec/spec_helper.rb for instructions + #gem 'perftools.rb' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index b98ceb4789..4af4129c5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,7 +356,6 @@ GEM xml-simple paypal-sdk-merchant (1.106.1) paypal-sdk-core (~> 0.2.3) - perftools.rb (2.0.1) pg (0.13.2) poltergeist (1.5.0) capybara (~> 2.1) @@ -550,7 +549,6 @@ DEPENDENCIES newrelic_rpm oj paperclip - perftools.rb pg poltergeist pry-debugger