Created
May 18, 2009 07:39
-
-
Save edbond/113360 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/admin/blogs_controller.rb b/app/controllers/admin/blogs_controller.rb | |
index ca3cdf2..390b53b 100644 | |
--- a/app/controllers/admin/blogs_controller.rb | |
+++ b/app/controllers/admin/blogs_controller.rb | |
@@ -1,4 +1,4 @@ | |
-require 'application' | |
+require 'application_controller' | |
module Admin | |
class BlogsController < ::ApplicationController | |
# GET /blogs | |
@@ -86,4 +86,4 @@ module Admin | |
end | |
end | |
end | |
-end | |
\ No newline at end of file | |
+end | |
diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb | |
index 7437b5b..c1fa5d3 100644 | |
--- a/app/controllers/blogs_controller.rb | |
+++ b/app/controllers/blogs_controller.rb | |
@@ -1,4 +1,4 @@ | |
-require 'application' | |
+require 'application_controller' | |
class BlogsController < ApplicationController | |
# GET /blogs | |
# GET /blogs.xml | |
diff --git a/config/environment.rb b/config/environment.rb | |
index 06b60a5..1126638 100644 | |
--- a/config/environment.rb | |
+++ b/config/environment.rb | |
@@ -14,8 +14,9 @@ require File.join(File.dirname(__FILE__), 'boot') | |
Rails::Initializer.run do |config| | |
config.threadsafe! | |
#config.gem "newrelic_rpm" | |
-#config.gem "newrelic_rpm", :version => '2.8.1' | |
-#config.gem "newrelic_rpm", :version => '2.9.0' | |
+ config.gem "newrelic_rpm", :version => '2.8.11' | |
+ #config.gem "newrelic_rpm", :version => '2.9.0' | |
+ | |
# Settings in config/environments/* take precedence over those specified here. | |
# Application configuration should go into files in config/initializers | |
# -- all .rb files in that directory are automatically loaded. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment