Actionpack typo fixes. #35030
Merged
Actionpack typo fixes. #35030
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gmcgibbon
approved these changes
Jan 23, 2019
| @@ -7,7 +7,11 @@ | |||
|
|
|||
| module AbstractController | |||
| class DoubleRenderError < Error | |||
| DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"." | |||
| DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. " \ | |||
There was a problem hiding this comment.
For breaking up strings, you could also use a heredoc and squish.
There was a problem hiding this comment.
These are cosmetic changes which we don’t accept.
There was a problem hiding this comment.
Yup. Can you please revert. If you want to fix typos, it is fine. If you want to change the way the code looks, please don't.
kaspth
reviewed
Jan 23, 2019
| @@ -7,7 +7,11 @@ | |||
|
|
|||
| module AbstractController | |||
| class DoubleRenderError < Error | |||
| DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"." | |||
| DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. " \ | |||
There was a problem hiding this comment.
These are cosmetic changes which we don’t accept.
| @@ -73,7 +73,7 @@ def initialize(controller, env, defaults) | |||
| # The primary options are: | |||
| # * <tt>:partial</tt> - See <tt>ActionView::PartialRenderer</tt> for details. | |||
| # * <tt>:file</tt> - Renders an explicit template file. Add <tt>:locals</tt> to pass in, if so desired. | |||
| # It shouldn’t be used directly with unsanitized user input due to lack of validation. | |||
| # It shouldn't be used directly with unsanitized user input due to lack of validation. | |||
| @@ -795,7 +795,7 @@ def init_with(coder) # :nodoc: | |||
| @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. | |||
There was a problem hiding this comment.
I’d rather keep the git history here.
There was a problem hiding this comment.
I think it is fine here. That word doesn't exist 😄
alkesh26
changed the title
|
@kaspth @rafaelfranca I think this is good to go now. We can merge this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.