aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_view/lookup_context.rb2
-rw-r--r--activemodel/lib/active_model/validations.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index cf28772f12..10f1911e31 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -112,7 +112,7 @@ module ActionView
end
def default_handlers #:nodoc:
- @detault_handlers ||= Template::Handlers.extensions
+ @default_handlers ||= Template::Handlers.extensions
end
def handlers_regexp #:nodoc:
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index ba8648f8c9..6013cdb23b 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -112,7 +112,6 @@ module ActiveModel
# end
# end
#
- # This usage applies to +validate_on_create+ and +validate_on_update as well+.
def validate(*args, &block)
options = args.last
if options.is_a?(Hash) && options.key?(:on)