Merge branch 'master' of github.com:crossroads/fat_free_crm

Author: Ben Tillman

Gemfile

@@ -71,3 +71,7 @@ group :test do
   gem 'database_cleaner'
   gem 'ci_reporter', :git => 'http://github.com/crossroads/ci_reporter.git'
 end
+
+group :production do
+  gem "newrelic_rpm"
+end

Gemfile.lock

@@ -147,6 +147,7 @@ GEM
     net-ssh (2.0.23)
     net-ssh-gateway (1.0.1)
       net-ssh (>= 1.99.1)
+    newrelic_rpm (2.13.3)
     nokogiri (1.4.4)
     pg (0.9.0)
     polyglot (0.3.1)
@@ -243,6 +244,7 @@ DEPENDENCIES
   hoptoad_notifier
   is_paranoid!
   meta_search!
+  newrelic_rpm
   paperclip!
   pg (>= 0.9.0)
   rails (= 3.0.3)

app/views/opportunities/_top_section.html.haml

@@ -45,7 +45,7 @@
 
             -# Add [-- None --] account choice when editing existing opportunity that has an account.
             - options = { :selected => @account.id || 0 }
-            - options[:include_blank] = t(:select_none) unless @opportunity.new_record? || @opportunity.account.blank?
+            - options[:include_blank] = true
 
             = collection_select :account, :id, @accounts, :id, :name, options, { :style => "width:330px; display:none;" }
             = a.text_field :name, :style => "width:324px; display:none;"

config/deploy.rb

@@ -10,6 +10,8 @@
 load 'recipes/postgresql.rb'
 load 'recipes/whenever.rb'
 load 'recipes/stack.rb'
+load 'recipes/newrelic.rb'
+load 'recipes/log.rb'
 
 default_run_options[:pty] = true
 

recipes/log.rb

@@ -0,0 +1,12 @@
+namespace :log do
+
+  desc "tail production log files"
+  task :tail, :roles => :app do
+    run "tail -f #{shared_path}/log/production.log" do |channel, stream, data|
+      puts  # for an extra line break before the host name
+      puts "#{channel[:host]}: #{data}"
+      break if stream == :err
+    end
+  end
+
+end

recipes/newrelic.rb

@@ -0,0 +1,14 @@
+namespace :newrelic do
+
+  task :default do
+    newrelic.yml
+  end
+
+  desc "Copy newrelic.yml"
+  task :yml do
+    run "ln -sf #{deploy_to}/shared/config/newrelic.yml #{release_path}/config/newrelic.yml"
+  end
+
+end
+
+before "deploy:symlink", "newrelic:yml"