Merge pull request rails#6632 from route/one_line_code_for_logger

One-liner code for logger in ActionView::Helpers::ControllerHelper

actionpack/lib/action_view/helpers/controller_helper.rb

@@ -18,11 +18,7 @@ def assign_controller(controller)
       end
 
       def logger
-        if controller.respond_to?(:logger)
-          controller.logger
-        else
-          nil
-        end
+        controller.logger if controller.respond_to?(:logger)
       end
     end
   end