diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-08-19 10:56:21 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-08-19 10:56:21 -0500 |
| commit | f454ad37ed46e14eb535eb3305d2c3183a5d52f7 (patch) | |
| tree | a77bb7de9c33e4339d13edf733136e5533bc41df | |
| parent | dd86b3b5cd51bdb48e462562b83e05a5d62babfa (diff) | |
| parent | 8e35ab8610714953770520d7fee6720d4d9eff11 (diff) | |
| download | rails-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
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | guides/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | guides/source/contributing_to_ruby_on_rails.md | 3 |
3 files changed, 9 insertions, 0 deletions
@@ -76,6 +76,8 @@ and may also be used independently outside Rails. We encourage you to contribute to Ruby on Rails! Please check out the [Contributing to Ruby on Rails guide](http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html) for guidelines about how to proceed. [Join us!](http://contributors.rubyonrails.org) +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](CODE_OF_CONDUCT.md). + ## Code Status [](https://travis-ci.org/rails/rails) diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index fd177b4238..09fb7b1a0e 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,7 @@ +* Add code of conduct to contributing guide + + *Jon Moss* + * New section in Configuring: Configuring Active Job *Eliot Sykes* 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 |