diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-07 20:58:54 +0000 |
| commit | 67b17d029a8eeddd908cce2d4e0e27e4708e8463 (patch) | |
| tree | 4cd589411104f7222835dd5012f4bb7743e1d215 /railties/guides | |
| parent | bb063b2f1b3e5b6fb2a4732cb696929f1652c555 (diff) | |
| parent | 5968d7a65886d3450698889f685eccaf54749f43 (diff) | |
| download | rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.gz rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.tar.bz2 rails-67b17d029a8eeddd908cce2d4e0e27e4708e8463.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties/guides')
| -rw-r--r-- | railties/guides/source/active_record_querying.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile index 64a68f7592..ed3968e226 100644 --- a/railties/guides/source/active_record_querying.textile +++ b/railties/guides/source/active_record_querying.textile @@ -420,7 +420,7 @@ Client.limit(5).offset(30) will return instead a maximum of 5 clients beginning with the 31st. The SQL looks like: <sql> -SELECT * FROM clients LIMIT 5, 30 +SELECT * FROM clients LIMIT 5 OFFSET 30 </sql> h3. Group diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index 3454b8b7a3..82e7edfc84 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/railties/guides/source/contributing_to_ruby_on_rails.textile @@ -364,6 +364,20 @@ Please make sure the patch does not introduce whitespace errors: $ git apply --whitespace=error-all mynew_patch.diff </shell> +You can check your patches by applying your patch to an 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: + +<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. |