aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2012-01-26 10:04:57 +0400
committerbrainopia <brainopia@evilmartians.com>2012-01-26 10:04:57 +0400
commit51ccb7f59c83120bf6869f1febfebaec44bcface (patch)
tree479fab68b43d5345e95d0c7414f93c782913891b
parent522c0fdb555d54ca68d1acfd1bd8e67fd0040086 (diff)
downloadrails-51ccb7f59c83120bf6869f1febfebaec44bcface.tar.gz
rails-51ccb7f59c83120bf6869f1febfebaec44bcface.tar.bz2
rails-51ccb7f59c83120bf6869f1febfebaec44bcface.zip
Fix contributing guide to reflect preferred position on indentation
Fix incorrect recommendation from indenting after private/protected to not. Based on opinions of @spastorino, @jonleighton, @tenderlove https://github.com/rails/rails/pull/1838#issuecomment-1440281 https://en.twitter.com/#!/spastorino/status/142054749351575552 https://en.twitter.com/#!/tenderlove/status/142014046445641728 https://en.twitter.com/#!/jonleighton/status/142021813415841794
-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+.