diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-10-10 23:29:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 23:29:35 -0400 |
| commit | 68a2888ef08faf38c0643921a8259beef5fbe630 (patch) | |
| tree | d4ea39084e7bb2b767d24c5b61c9a521d49b144a | |
| parent | b205ea2dc6c70b2b8e2134640e3056ed33fdc6be (diff) | |
| parent | b1ee5e8e7f98b32196423a144e7a87ae284c7a5c (diff) | |
| download | rails-68a2888ef08faf38c0643921a8259beef5fbe630.tar.gz rails-68a2888ef08faf38c0643921a8259beef5fbe630.tar.bz2 rails-68a2888ef08faf38c0643921a8259beef5fbe630.zip | |
Merge pull request #30855 from boone/fix_typos
Fix some typos [ci skip]
| -rw-r--r-- | actionpack/lib/action_controller/metal/redirecting.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/tag_helper.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/test_case.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/callbacks.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index b8a80eef31..8de57f9199 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -83,7 +83,7 @@ module ActionController # # ==== Options # * <tt>:fallback_location</tt> - The default fallback location that will be used on missing `Referer` header. - # * <tt>:allow_other_host</tt> - Allows or dissallow redirection to the host that is different to the current host + # * <tt>:allow_other_host</tt> - Allows or disallow redirection to the host that is different to the current host # # All other options that can be passed to <tt>redirect_to</tt> are accepted as # options and the behavior is identical. diff --git a/actionview/lib/action_view/helpers/tag_helper.rb b/actionview/lib/action_view/helpers/tag_helper.rb index a64d7e396e..a6cec3f69c 100644 --- a/actionview/lib/action_view/helpers/tag_helper.rb +++ b/actionview/lib/action_view/helpers/tag_helper.rb @@ -166,7 +166,7 @@ module ActionView # This may come in handy when using jQuery's HTML5-aware <tt>.data()</tt> # from 1.4.3. # - # tag.div data: { city_state: %w( Chigaco IL ) } + # tag.div data: { city_state: %w( Chicago IL ) } # # => <div data-city-state="["Chicago","IL"]"></div> # # The generated attributes are escaped by default. This can be disabled using diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb index 93be2be2d1..e1cbae5845 100644 --- a/actionview/lib/action_view/test_case.rb +++ b/actionview/lib/action_view/test_case.rb @@ -270,7 +270,7 @@ module ActionView begin routes = @controller.respond_to?(:_routes) && @controller._routes rescue - # Dont call routes, if there is an error on _routes call + # Don't call routes, if there is an error on _routes call end if routes && @@ -286,7 +286,7 @@ module ActionView begin routes = @controller.respond_to?(:_routes) && @controller._routes rescue - # Dont call routes, if there is an error on _routes call + # Don't call routes, if there is an error on _routes call end routes && diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index a2439e6ec7..ac1070e65b 100644 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -240,7 +240,7 @@ module ActiveRecord # # private # - # def log_chidren + # def log_children # # Child processing # end # @@ -265,7 +265,7 @@ module ActiveRecord # # private # - # def log_chidren + # def log_children # # Child processing # end # |