aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2015-08-19 10:56:21 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2015-08-19 10:56:21 -0500
commitf454ad37ed46e14eb535eb3305d2c3183a5d52f7 (patch)
treea77bb7de9c33e4339d13edf733136e5533bc41df /guides/source
parentdd86b3b5cd51bdb48e462562b83e05a5d62babfa (diff)
parent8e35ab8610714953770520d7fee6720d4d9eff11 (diff)
downloadrails-f454ad37ed46e14eb535eb3305d2c3183a5d52f7.tar.gz
rails-f454ad37ed46e14eb535eb3305d2c3183a5d52f7.tar.bz2
rails-f454ad37ed46e14eb535eb3305d2c3183a5d52f7.zip
Merge pull request #21294 from maclover7/codeofconduct
Add code of conduct info to README.md and to contributing guide
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/contributing_to_ruby_on_rails.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/guides/source/contributing_to_ruby_on_rails.md b/guides/source/contributing_to_ruby_on_rails.md
index 3b944f1274..ba82713266 100644
--- a/guides/source/contributing_to_ruby_on_rails.md
+++ b/guides/source/contributing_to_ruby_on_rails.md
@@ -15,6 +15,9 @@ After reading this guide, you will know:
Ruby on Rails is not "someone else's framework." Over the years, hundreds of people have contributed to Ruby on Rails ranging from a single character to massive architectural changes or significant documentation - all with the goal of making Ruby on Rails better for everyone. Even if you don't feel up to writing code or documentation yet, there are a variety of other ways that you can contribute, from reporting issues to testing patches.
+As mentioned in [Rails
+README](https://github.com/rails/rails/blob/master/README.md), everyone interacting in Rails and its sub-project’s codebases, issue trackers, chat rooms, and mailing lists is expected to follow the Rails [code of conduct](https://github.com/rails/rails/blob/master/CODE_OF_CONDUCT.md).
+
--------------------------------------------------------------------------------
Reporting an Issue