2 files changed, 3 insertions, 26 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 6bf2d8db20..b6a9eccdb6 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -24,13 +24,7 @@ module Rails
   autoload :InfoController, 'rails/info_controller'
 
   class << self
-    def application
-      @application ||= nil
-    end
-
-    def application=(application)
-      @application = application
-    end
+    attr_accessor :application, :cache, :logger
 
     # The Configuration instance used to configure the Rails environment
     def configuration
@@ -64,14 +58,6 @@ module Rails
       application.initialized?
     end
 
-    def logger
-      @logger ||= nil
-    end
-
-    def logger=(logger)
-      @logger = logger
-    end
-
     def backtrace_cleaner
       @backtrace_cleaner ||= begin
         # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
@@ -95,14 +81,6 @@ module Rails
       @_env = ActiveSupport::StringInquirer.new(environment)
     end
 
-    def cache
-      @cache ||= nil
-    end
-
-    def cache=(cache)
-      @cache = cache
-    end
-
     # Returns all rails groups for loading based on:
     #
     # * The Rails environment;
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 5fc4ab8f6c..24d97db407 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -4,8 +4,8 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 <% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, except: [ :index, :new, :create ]
-  
+  before_action :set_<%= singular_table_name %>, only: [ :show, :edit, :update, :destroy ]
+
   # GET <%= route_url %>
   # GET <%= route_url %>.json
   def index
@@ -82,7 +82,6 @@ class <%= controller_class_name %>Controller < ApplicationController
     end
   end
 
-
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_<%= singular_table_name %>