From 276a35c75c6eef958d5987450492981871efbe9b Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 11 Apr 2014 13:01:58 +0200 Subject: [PATCH 1/2] Linked to new styleguides This way HoundCI makes more sense. --- CONTRIBUTING.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6aa42509cf..5b974b478b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,10 @@ For examples of feedback on merge requests please look at already [closed merge ## Style guides -1. [Ruby style guide](https://github.com/bbatsov/ruby-style-guide) -1. [Rails style guide](https://github.com/bbatsov/rails-style-guide) -1. [CoffeeScript style guide](https://github.com/polarmobile/coffeescript-style-guide) -1. [Shell command guidelines](doc/development/shell_commands.md) +1. [Formatting](https://github.com/thoughtbot/guides/tree/master/style#formatting) +2. [Naming](https://github.com/thoughtbot/guides/tree/master/style#naming) +3. [Ruby](https://github.com/thoughtbot/guides/tree/master/style#ruby) +4. [Rails](https://github.com/thoughtbot/guides/tree/master/style#rails) +5. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript) +6. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing) +7. [Shell commands](doc/development/shell_commands.md) From 47f3eec515c8585595394323f15b1b454fdbb734 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Fri, 11 Apr 2014 22:04:18 +0200 Subject: [PATCH 2/2] Put the bbatsov back in --- CONTRIBUTING.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b974b478b6..290804e6187 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,11 +106,10 @@ For examples of feedback on merge requests please look at already [closed merge 1. It conforms to the following style guides ## Style guides - -1. [Formatting](https://github.com/thoughtbot/guides/tree/master/style#formatting) -2. [Naming](https://github.com/thoughtbot/guides/tree/master/style#naming) -3. [Ruby](https://github.com/thoughtbot/guides/tree/master/style#ruby) -4. [Rails](https://github.com/thoughtbot/guides/tree/master/style#rails) -5. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript) -6. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing) -7. [Shell commands](doc/development/shell_commands.md) +1. [Ruby](https://github.com/bbatsov/ruby-style-guide) +2. [Rails](https://github.com/bbatsov/rails-style-guide) +3. [Formatting](https://github.com/thoughtbot/guides/tree/master/style#formatting) +4. [Naming](https://github.com/thoughtbot/guides/tree/master/style#naming) +8. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing) +7. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript) +9. [Shell commands](doc/development/shell_commands.md)