Permalink
Browse files

Merge pull request #21294 from maclover7/codeofconduct

Add code of conduct info to README.md and to contributing guide
  • Loading branch information...
guilleiguaran committed Aug 19, 2015
2 parents dd86b3b + 8e35ab8 commit f454ad37ed46e14eb535eb3305d2c3183a5d52f7
Showing with 9 additions and 0 deletions.
  1. +2 −0 README.md
  2. +4 −0 guides/CHANGELOG.md
  3. +3 −0 guides/source/contributing_to_ruby_on_rails.md
View
@@ -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
[![Build Status](https://travis-ci.org/rails/rails.svg?branch=master)](https://travis-ci.org/rails/rails)
View
@@ -1,3 +1,7 @@
* Add code of conduct to contributing guide
*Jon Moss*
* New section in Configuring: Configuring Active Job
*Eliot Sykes*
@@ -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

0 comments on commit f454ad3

Please sign in to comment.