diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-07 05:26:13 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-07 05:26:13 -0700 |
| commit | b2b004262a1b54ba3f83c88793e3a8edff09c480 (patch) | |
| tree | 76c4be7ff9df54d7621fc128557d08dc7a317f86 | |
| parent | 68598df25ac92038648dccd01b1e4ed534dfc2a2 (diff) | |
| parent | 2c92f5b92fafe036b53cef36428bd8df1bdb99b7 (diff) | |
| download | rails-b2b004262a1b54ba3f83c88793e3a8edff09c480.tar.gz rails-b2b004262a1b54ba3f83c88793e3a8edff09c480.tar.bz2 rails-b2b004262a1b54ba3f83c88793e3a8edff09c480.zip | |
Merge pull request #10875 from vipulnsward/fix_some_typos_in_as
Fix some typos [ci skip]
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/delegation.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/file_update_checker.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb index 6d42667e97..3dde87ac2e 100644 --- a/activesupport/lib/active_support/core_ext/module/delegation.rb +++ b/activesupport/lib/active_support/core_ext/module/delegation.rb @@ -164,7 +164,7 @@ class Module # # Reason is twofold: On one hand doing less calls is in general better. # On the other hand it could be that the target has side-effects, - # whereas conceptualy, from the user point of view, the delegator should + # whereas conceptually, from the user point of view, the delegator should # be doing one call. if allow_nil module_eval(<<-EOS, file, line - 3) diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb index 20136dd1b0..d6918bede2 100644 --- a/activesupport/lib/active_support/file_update_checker.rb +++ b/activesupport/lib/active_support/file_update_checker.rb @@ -115,7 +115,7 @@ module ActiveSupport end def compile_glob(hash) - hash.freeze # Freeze so changes aren't accidently pushed + hash.freeze # Freeze so changes aren't accidentally pushed return if hash.empty? globs = hash.map do |key, value| |