summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-08 16:33:23 +0000
committerRémy Coutable <remy@rymai.me>2017-02-08 16:33:23 +0000
commitebf168d023746c3c458d355c3e6db2c54974a9fa (patch)
treec83e7e130859e7fe654e2f6b987de82221bd634a /CONTRIBUTING.md
parente1ba28a98f110bd33e43c9c6ae7d502284201ff9 (diff)
parentc34e85edc1b0bd34bd4d20e1c94809d2adbc2169 (diff)
downloadgitlab-ce-ebf168d023746c3c458d355c3e6db2c54974a9fa.tar.gz
Merge branch 'patch-12' into 'master'
Fix link in CONTRIBUTING.md See merge request !8859
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 315cd1e598c..7c08c29d8a3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -430,7 +430,7 @@ merge request:
1. [Newlines styleguide][newlines-styleguide]
1. [Testing](doc/development/testing.md)
1. [JavaScript (ES6)](https://github.com/airbnb/javascript)
-1. [JavaScript (ES5)](https://github.com/airbnb/javascript/tree/master/es5)
+1. [JavaScript (ES5)](https://github.com/airbnb/javascript/tree/es5-deprecated/es5)
1. [SCSS styleguide][scss-styleguide]
1. [Shell commands](doc/development/shell_commands.md) created by GitLab
contributors to enhance security