aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-01-25 23:50:52 -0800
committerXavier Noria <fxn@hashref.com>2012-01-25 23:50:52 -0800
commit70b059835b031236f4fcd5b11d004fc2c82b4e98 (patch)
treeb5764c76d687bfc9dc01396249a6f78915ecdc3f /railties/guides
parent6a7d3780df39a5b307d5a9087625f5559d22265a (diff)
parent51ccb7f59c83120bf6869f1febfebaec44bcface (diff)
downloadrails-70b059835b031236f4fcd5b11d004fc2c82b4e98.tar.gz
rails-70b059835b031236f4fcd5b11d004fc2c82b4e98.tar.bz2
rails-70b059835b031236f4fcd5b11d004fc2c82b4e98.zip
Merge pull request #4685 from brainopia/fix_contribute_guide
Fix contributing guide to reflect preferred position on indentation
Diffstat (limited to 'railties/guides')
-rw-r--r--railties/guides/source/contributing_to_ruby_on_rails.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index e082fd2941..0f024d3b0b 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -309,7 +309,7 @@ Rails follows a simple set of coding style conventions.
* Two spaces, no tabs.
* No trailing whitespace. Blank lines should not have any space.
-* Indent after private/protected.
+* Do not indent after private/protected. Private/protected should have the same indentation as the methods around.
* Prefer +&amp;&amp;+/+||+ over +and+/+or+.
* Prefer class << self block over self.method for class methods.
* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.