nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MS DC; as newrelic yml is always included, you need it in your bundle; also, make travis scripts noisy if they fail

Browse source
This commit is contained in:
Maxwell Salzberg 2012-01-05 17:50:11 -08:00
parent 646981aa17
commit fa55200e9c
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -39,7 +39,7 @@ group :production do # we don't install these on travis to speed up test runs
# reporting # reporting
gem 'hoptoad_notifier' gem 'hoptoad_notifier'
gem 'newrelic_rpm', :require => false gem 'newrelic_rpm'
gem 'rack-google-analytics', :require => 'rack/google-analytics' gem 'rack-google-analytics', :require => 'rack/google-analytics'
gem 'rack-piwik', :require => 'rack/piwik' gem 'rack-piwik', :require => 'rack/piwik'
end end

2
config/application.rb
View file

@ -17,8 +17,6 @@ require 'rails/all'
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler) 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 module Diaspora
class Application < Rails::Application class Application < Rails::Application

4
config/ci/before-travis.sh
View file

@ -18,5 +18,5 @@ fi
# Set up database # Set up database
echo "Creating databases for $DB and loading schema" echo "Creating databases for $DB and loading schema"
bundle exec rake db:create bundle exec rake db:create --trace
bundle exec rake db:schema:load bundle exec rake db:schema:load --trace