aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb2
-rw-r--r--activemodel/lib/active_model/callbacks.rb2
-rw-r--r--activemodel/lib/active_model/errors.rb2
-rw-r--r--activemodel/lib/active_model/model.rb2
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb2
-rw-r--r--activesupport/lib/active_support/concern.rb5
-rw-r--r--activesupport/lib/active_support/testing/declarative.rb2
-rw-r--r--activesupport/lib/active_support/testing/isolation.rb2
-rw-r--r--railties/lib/rails/initializable.rb2
10 files changed, 11 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 028a8d3fba..67c9efc0ab 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -576,7 +576,7 @@ module ActionController
#
# The exception is stored in the exception accessor for further inspection.
module RaiseActionExceptions
- def self.included(base)
+ def self.included(base) #:nodoc:
unless base.method_defined?(:exception) && base.method_defined?(:exception=)
base.class_eval do
attr_accessor :exception
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index f30d00b355..2242c59131 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -459,7 +459,7 @@ module ActiveModel
end
protected
- def attribute_method?(attr_name)
+ def attribute_method?(attr_name) #:nodoc:
respond_to_without_attributes?(:attributes) && attributes.include?(attr_name)
end
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index b8ba1a0a52..80385c2614 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -46,7 +46,7 @@ module ActiveModel
# Would only create the +after_create+ and +before_create+ callback methods in
# your class.
module Callbacks
- def self.extended(base)
+ def self.extended(base) #:nodoc:
base.class_eval do
include ActiveSupport::Callbacks
end
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 6307477145..567677bbb9 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -76,7 +76,7 @@ module ActiveModel
@messages = {}
end
- def initialize_dup(other)
+ def initialize_dup(other) #:nodoc:
@messages = other.messages.dup
super
end
diff --git a/activemodel/lib/active_model/model.rb b/activemodel/lib/active_model/model.rb
index 3af95b09b0..cb0a051ca5 100644
--- a/activemodel/lib/active_model/model.rb
+++ b/activemodel/lib/active_model/model.rb
@@ -54,7 +54,7 @@ module ActiveModel
# For more detailed information on other functionalities available, please refer
# to the specific modules included in <tt>ActiveModel::Model</tt> (see below).
module Model
- def self.included(base)
+ def self.included(base) #:nodoc:
base.class_eval do
extend ActiveModel::Naming
extend ActiveModel::Translation
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
index 17377bad96..3b4537aab4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -2,7 +2,7 @@ module ActiveRecord
module ConnectionAdapters # :nodoc:
module QueryCache
class << self
- def included(base)
+ def included(base) #:nodoc:
dirties_query_cache base, :insert, :update, :delete
end
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index c94a8d99f4..b927b58a9a 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -56,7 +56,7 @@ module ActiveSupport
# these from +Host+ directly including +Foo+ in +Bar+:
#
# module Bar
- # include Foo
+ # include Foo
# def self.included(base)
# base.method_injected_by_foo
# end
@@ -94,9 +94,8 @@ module ActiveSupport
# class Host
# include Bar # works, Bar takes care now of its dependencies
# end
- #
module Concern
- def self.extended(base)
+ def self.extended(base) #:nodoc:
base.instance_variable_set("@_dependencies", [])
end
diff --git a/activesupport/lib/active_support/testing/declarative.rb b/activesupport/lib/active_support/testing/declarative.rb
index 1c05d45888..508e37254a 100644
--- a/activesupport/lib/active_support/testing/declarative.rb
+++ b/activesupport/lib/active_support/testing/declarative.rb
@@ -2,7 +2,7 @@ module ActiveSupport
module Testing
module Declarative
- def self.extended(klass)
+ def self.extended(klass) #:nodoc:
klass.class_eval do
unless method_defined?(:describe)
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 50ec50ca52..27d444fd91 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -64,7 +64,7 @@ module ActiveSupport
end
end
- def self.included klass
+ def self.included(klass) #:nodoc:
klass.extend(Module.new {
def test_methods
ParallelEach.new super
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index a61673fab8..1a0b6d1e1a 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -2,7 +2,7 @@ require 'tsort'
module Rails
module Initializable
- def self.included(base)
+ def self.included(base) #:nodoc:
base.extend ClassMethods
end