diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-11-17 01:50:49 +0530 |
| commit | 7b70eeed43045dc29e73e23fbfdc323e9d397026 (patch) | |
| tree | 8c60cd5893f7e2d231130b7c0abdc0aee8e3bec7 /activesupport/lib | |
| parent | 8eefdb6d7056dc0d4d63a5c34a4b12701ba21c88 (diff) | |
| parent | 1fd008cd44cd2eea37db57ee6b3c17d3585d88c1 (diff) | |
| download | rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.gz rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.tar.bz2 rails-7b70eeed43045dc29e73e23fbfdc323e9d397026.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_dispatch/routing/redirection.rb
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/concern.rb | 10 | ||||
| -rw-r--r-- | activesupport/lib/active_support/notifications.rb | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb index fb7065ef3b..eeeba60839 100644 --- a/activesupport/lib/active_support/concern.rb +++ b/activesupport/lib/active_support/concern.rb @@ -4,7 +4,9 @@ module ActiveSupport # module M # def self.included(base) # base.extend ClassMethods - # scope :disabled, -> { where(disabled: true) } + # base.class_eval do + # scope :disabled, -> { where(disabled: true) } + # end # end # # module ClassMethods @@ -77,10 +79,8 @@ module ActiveSupport # module Foo # extend ActiveSupport::Concern # included do - # class_eval do - # def self.method_injected_by_foo - # ... - # end + # def self.method_injected_by_foo + # ... # end # end # end diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb index 099117cebb..705a4693b7 100644 --- a/activesupport/lib/active_support/notifications.rb +++ b/activesupport/lib/active_support/notifications.rb @@ -84,15 +84,15 @@ module ActiveSupport # resulting in the following output within the logs including a hash with the payload: # # notification: process_action.action_controller 2012-04-13 01:08:35 +0300 2012-04-13 01:08:35 +0300 af358ed7fab884532ec7 { - # :controller=>"Devise::SessionsController", - # :action=>"new", - # :params=>{"action"=>"new", "controller"=>"devise/sessions"}, - # :format=>:html, - # :method=>"GET", - # :path=>"/login/sign_in", - # :status=>200, - # :view_runtime=>279.3080806732178, - # :db_runtime=>40.053 + # controller: "Devise::SessionsController", + # action: "new", + # params: {"action"=>"new", "controller"=>"devise/sessions"}, + # format: :html, + # method: "GET", + # path: "/login/sign_in", + # status: 200, + # view_runtime: 279.3080806732178, + # db_runtime: 40.053 # } # # You can also subscribe to all events whose name matches a certain regexp: |