Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a lot of Oxford commas #32849

Merged
merged 1 commit into from
May 11, 2018
Merged

Conversation

anthonycrumley
Copy link
Contributor

@anthonycrumley anthonycrumley commented May 9, 2018

A regular expression was used to find a lot of missing Oxford
commas and add them. The regular expression was as follows.

", ([a-zA-Z0-9.`:'"]+ ){1,6}(or|and) "

@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @schneems (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

Copy link
Member

@matthewd matthewd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@@ -323,7 +323,7 @@ Validations

Active Record allows you to validate the state of a model before it gets written
into the database. There are several methods that you can use to check your
models and validate that an attribute value is not empty, is unique and not
models and validate that an attribute value is not empty, is unique, and not
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✂️

This is correctly a compound item; the missing comma is on the next line.

@@ -348,7 +348,7 @@ by asking the debugger for help. Type: `help`
break -- Sets breakpoints in the source code
catch -- Handles exception catchpoints
condition -- Sets conditions on breakpoints
continue -- Runs until program ends, hits a breakpoint or reaches a line
continue -- Runs until program ends, hits a breakpoint, or reaches a line
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✂️

We can't editorialize on byebug's output 😄

@@ -365,7 +365,7 @@ by asking the debugger for help. Type: `help`
irb -- Starts an IRB session
kill -- Sends a signal to the current process
list -- Lists lines of source code
method -- Shows methods of an object, class or module
method -- Shows methods of an object, class, or module
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✂️

@@ -575,7 +575,7 @@ Let's have `byebug` help us with it.
Shows variables and its values


var all -- Shows local, global and instance variables of self.
var all -- Shows local, global, and instance variables of self.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✂️

@anthonycrumley
Copy link
Contributor Author

@matthewd Thanks for the feedback. I made changes as per your comments.

Copy link
Member

@matthewd matthewd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks again. If you could squash this down to a single commit, I think it's good to go 👍

[ci skip] A regular expression was used to find a lot of missing Oxford
commas and add them.  The regular expression was as follows.

", ([a-zA-Z0-9.\`:'\"]+ ){1,6}(or|and) "
@anthonycrumley
Copy link
Contributor Author

@matthewd This is now squashed down to one commit. 👍

@anthonycrumley
Copy link
Contributor Author

@matthewd For code change responses to comments on a pull request, does the Rails team find it easier to review a separate commit that is later squashed or an amendment of the original commit?

Thanks for your feedback. 😄

@matthewd matthewd merged commit 5ed8aa9 into rails:master May 11, 2018
@matthewd
Copy link
Member

Personally, I'd say it depends whether the change is short enough, or has changed so much, that re-reading the full diff is the easiest way to review it -- in which case pre-squashing saves a back-and-forth. In a case like this, it was much easier for me to initially review as an additional commit. 👍

@anthonycrumley anthonycrumley deleted the oxford-commas branch June 28, 2018 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants