diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-01-28 12:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 12:05:31 -0500 |
| commit | 2f9f699a2f6c6d470d2c639fe07d7850f6858c53 (patch) | |
| tree | 9b6fba5fa49a927fec28104a8bde8f31198625ff | |
| parent | e3d43333db2c70dac73d9b41ddd277dc8843ab32 (diff) | |
| parent | 4b9d6e01ba267c13be7136a9c83699eeb9bcc1bf (diff) | |
| download | rails-2f9f699a2f6c6d470d2c639fe07d7850f6858c53.tar.gz rails-2f9f699a2f6c6d470d2c639fe07d7850f6858c53.tar.bz2 rails-2f9f699a2f6c6d470d2c639fe07d7850f6858c53.zip | |
Merge pull request #35030 from alkesh26/actionpack-long-string-indentation-and-typo-fix
Actionpack typo fixes.
| -rw-r--r-- | actionpack/lib/action_controller/metal/exceptions.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb index 30034be018..e1e0c6f456 100644 --- a/actionpack/lib/action_controller/metal/exceptions.rb +++ b/actionpack/lib/action_controller/metal/exceptions.rb @@ -52,7 +52,7 @@ module ActionController end # Raised when a nested respond_to is triggered and the content types of each - # are incompatible. For exampe: + # are incompatible. For example: # # respond_to do |outer_type| # outer_type.js do diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 04922b0715..815f82a1f2 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -795,7 +795,7 @@ module ActionController @permitted = coder.map["ivars"][:@permitted] when "!ruby/object:ActionController::Parameters" # YAML's Object format. Only needed because of the format - # backwardscompability above, otherwise equivalent to YAML's initialization. + # backwards compatibility above, otherwise equivalent to YAML's initialization. @parameters, @permitted = coder.map["parameters"], coder.map["permitted"] end end |