From fa55200e9c82e5e5dfffef13703588264c4d672c Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 5 Jan 2012 17:50:11 -0800
Subject: [PATCH] MS DC; as newrelic yml is always included, you need it in
 your bundle; also, make travis scripts noisy if they fail

---
 Gemfile                    | 2 +-
 config/application.rb      | 2 --
 config/ci/before-travis.sh | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2e42f997a..9887ea6e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ group :production do # we don't install these on travis to speed up test runs
 
   # reporting
   gem 'hoptoad_notifier'
-  gem 'newrelic_rpm', :require => false
+  gem 'newrelic_rpm'
   gem 'rack-google-analytics', :require => 'rack/google-analytics'
   gem 'rack-piwik', :require => 'rack/piwik'
 end
diff --git a/config/application.rb b/config/application.rb
index d3c8ee4af..72a1d72f8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,8 +17,6 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-# use newrelic if configured via config/newrelic.yml
-require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
 
 module Diaspora
   class Application < Rails::Application
diff --git a/config/ci/before-travis.sh b/config/ci/before-travis.sh
index 589bf24e8..0c49d3d5b 100755
--- a/config/ci/before-travis.sh
+++ b/config/ci/before-travis.sh
@@ -18,5 +18,5 @@ fi
 
 # Set up database
 echo "Creating databases for $DB and loading schema"
-bundle exec rake db:create
-bundle exec rake db:schema:load
+bundle exec rake db:create --trace
+bundle exec rake db:schema:load --trace