summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-07-22 10:53:45 -0400
committerStan Hu <stanhu@gmail.com>2016-07-22 20:13:46 -0700
commitd6ebd4a3f7af1b78259edc4a3ffdc4778f5d0725 (patch)
treef45ed4438ca53b13719e81189a694bda94b589bb /CONTRIBUTING.md
parent46a17ffd5a200b4d2aca914ef5bafe46db1cb9bf (diff)
downloadgitlab-ce-d6ebd4a3f7af1b78259edc4a3ffdc4778f5d0725.tar.gz
Update docs for CoffeeScript -> JavaScript.
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 14ff05c9aa3..dfb35fa6e88 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -460,7 +460,8 @@ merge request:
- string literal quoting style **Option A**: single quoted by default
1. [Rails](https://github.com/bbatsov/rails-style-guide)
1. [Testing](doc/development/testing.md)
-1. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style/coffeescript)
+1. [JavaScript (ES6)](https://github.com/airbnb/javascript)
+1. [JavaScript (ES5)](https://github.com/airbnb/javascript/tree/master/es5)
1. [SCSS styleguide][scss-styleguide]
1. [Shell commands](doc/development/shell_commands.md) created by GitLab
contributors to enhance security