Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielgrippi <danielgrippi@gmail.com>2011-11-07 07:35:20 +0400
committerdanielgrippi <danielgrippi@gmail.com>2011-11-07 07:35:30 +0400
commitde88c0ab487ae659ecad41990188b2bf4eedf3d9 (patch)
treeeb8642d9742ef979ff6bdddc930bce79c6e83f62
parent14842c1b4307d23dc81549c2f41f0e8d4d42cc25 (diff)
correct newrelic_ignore
-rw-r--r--app/controllers/publics_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 160373bf6..a24525534 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -3,7 +3,7 @@
# the COPYRIGHT file.
require File.join(Rails.root, 'lib', 'stream', 'public')
-require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
+require 'newrelic_rpm' if File.exists?(File.expand_path("#{Rails.root}/config/newrelic.yml", __FILE__))
class PublicsController < ApplicationController
require File.join(Rails.root, '/lib/diaspora/parser')
@@ -11,7 +11,7 @@ class PublicsController < ApplicationController
require File.join(Rails.root, '/lib/postzord/receiver/private')
include Diaspora::Parser
- newrelic_ignore if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
+ newrelic_ignore if File.exists?(File.expand_path("#{Rails.root}/config/newrelic.yml", __FILE__))
skip_before_filter :set_header_data
skip_before_filter :which_action_and_user