aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-04-21 01:28:59 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-04-21 01:28:59 -0700
commit0f93fe3dc778f39711efd8058e17b3bef1eefa40 (patch)
tree9501c7ec6970389819bb62fd553f53f12d0f0d7a /activerecord/lib/active_record
parentf0540c7961860ddfea470cd73fc92efccdad7417 (diff)
parent737edd220df2530130b34f926a4fde351e5045c0 (diff)
downloadrails-0f93fe3dc778f39711efd8058e17b3bef1eefa40.tar.gz
rails-0f93fe3dc778f39711efd8058e17b3bef1eefa40.tar.bz2
rails-0f93fe3dc778f39711efd8058e17b3bef1eefa40.zip
Merge pull request #10280 from vipulnsward/fix_typos_temp
fix typos [ci skip]
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/callbacks.rb2
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 22226b2f4f..e4c484d64b 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -83,7 +83,7 @@ module ActiveRecord
#
# In that case, <tt>Reply#destroy</tt> would only run +destroy_readers+ and _not_ +destroy_author+.
# So, use the callback macros when you want to ensure that a certain callback is called for the entire
- # hierarchy, and use the regular overwriteable methods when you want to leave it up to each descendant
+ # hierarchy, and use the regular overwritable methods when you want to leave it up to each descendant
# to decide whether they want to call +super+ and trigger the inherited callbacks.
#
# *IMPORTANT:* In order for inheritance to work for the callback queues, you must specify the
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 09ba2e0d4a..f23521430d 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -383,7 +383,7 @@ module ActiveRecord
TYPES = {}
- # Register an MySQL +type_id+ with a typcasting object in
+ # Register an MySQL +type_id+ with a typecasting object in
# +type+.
def self.register_type(type_id, type)
TYPES[type_id] = type