aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/contributing_to_ruby_on_rails.textile
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-03-05 11:29:57 +0100
committerXavier Noria <fxn@hashref.com>2011-03-05 11:57:32 +0100
commitf6a5449d431e5d9096edbf4cb52eb2d82f467925 (patch)
tree5f715a07925207f9bf91da212770e22b8908b6fc /railties/guides/source/contributing_to_ruby_on_rails.textile
parent5f99a899a82c7201b7047e4e95d591a572a9099b (diff)
downloadrails-f6a5449d431e5d9096edbf4cb52eb2d82f467925.tar.gz
rails-f6a5449d431e5d9096edbf4cb52eb2d82f467925.tar.bz2
rails-f6a5449d431e5d9096edbf4cb52eb2d82f467925.zip
copy-edits 819762c
* simplifies some sentences * use a more neutral language with less you/yours
Diffstat (limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 9739da2666..3454b8b7a3 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -349,22 +349,21 @@ $ git commit -a
$ git format-patch master --stdout > my_new_patch.diff
</shell>
-Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in.
+Open the diff file in your text editor of choice to sanity check the results, and make sure that no unintended changes crept in.
-You can check your patches by applying your patch to an different dedicated branch:
+You can also perform an extra check by applying the patch to a different dedicated branch:
<shell>
$ git checkout -b testing_branch
$ git apply --check my_new_patch.diff
</shell>
-You can make sure your patches don't add any whitespace by applying it yourself using the --whitespace=error-all option. Make sure you are on your dedicated test branche and:
+Please make sure the patch does not introduce whitespace errors:
<shell>
$ git apply --whitespace=error-all mynew_patch.diff
</shell>
-
h4. Create a Lighthouse Ticket
Now create a ticket with your patch. Go to the "new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new page at Lighthouse. Fill in a reasonable title and description, remember to attach your patch file, and tag the ticket with the ‘patch’ tag and whatever other subject area tags make sense.