summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-01 15:45:29 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-01 15:45:29 +0000
commitaba94f65f039908d14643f3854e3c2901ff843aa (patch)
tree6565d0e2a41337ec1716d6b7fd007eecb1416f33 /spec/javascripts
parent7e0cab4f2b9f772c6019afd74a797cdb8ed25f43 (diff)
parent5fb226a934b07b214dcbd6711f1068866c0c1dae (diff)
downloadgitlab-ce-aba94f65f039908d14643f3854e3c2901ff843aa.tar.gz
Merge branch 'decaffeinate-the-docs' into 'master'
Remove leftover references to coffeescript from comments and docs. I was looking at the front-end helper spec and noticed some outdated coffeescript refs in it. So I figured it wouldn't hurt to take a few minutes and remove all the coffeescript references in CE that we don't need anymore. I didn't touch any coffeescript references that could potentially break anything. Just docs and code comments. - [x] All builds are passing See merge request !7151
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/spec_helper.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
index bdce2465fbf..9cb8243ee2c 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascripts/spec_helper.js
@@ -28,7 +28,7 @@
// setTimeout(Teaspoon.execute, 1000)
// Matching files
// By default Teaspoon will look for files that match
-// _spec.{js,js.coffee,.coffee}. Add a filename_spec.js file in your spec path
+// _spec.{js,js.es6}. Add a filename_spec.js file in your spec path
// and it'll be included in the default suite automatically. If you want to
// customize suites, check out the configuration in teaspoon_env.rb
// Manifest