diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-16 11:06:28 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-16 11:06:28 +0000 |
commit | 08dd9d48876194cb087014fb3ed46c8c86f7052f (patch) | |
tree | 498f8561585feab515aaaefc10f6ccfdd2ed95b4 /lib | |
parent | 4e7d4b4dc181dd47db41147291eb0c677fddd4c0 (diff) | |
parent | 95d38ac9f97e80a26aac8026a4d38a54fbdc98e8 (diff) | |
download | gitlab-ce-08dd9d48876194cb087014fb3ed46c8c86f7052f.tar.gz |
Merge branch 'remove-es6-extension-configuration' into 'master'
Remove remaining references to .es6 file extension in our config files and documentation
See merge request !9980
Diffstat (limited to 'lib')
-rw-r--r-- | lib/banzai/pipeline/gfm_pipeline.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb index b25d6f18d59..fd4a6a107c2 100644 --- a/lib/banzai/pipeline/gfm_pipeline.rb +++ b/lib/banzai/pipeline/gfm_pipeline.rb @@ -2,10 +2,10 @@ module Banzai module Pipeline class GfmPipeline < BasePipeline # These filters convert GitLab Flavored Markdown (GFM) to HTML. - # The handlers defined in app/assets/javascripts/copy_as_gfm.js.es6 + # The handlers defined in app/assets/javascripts/copy_as_gfm.js # consequently convert that same HTML to GFM to be copied to the clipboard. # Every filter that generates HTML from GFM should have a handler in - # app/assets/javascripts/copy_as_gfm.js.es6, in reverse order. + # app/assets/javascripts/copy_as_gfm.js, in reverse order. # The GFM-to-HTML-to-GFM cycle is tested in spec/features/copy_as_gfm_spec.rb. def self.filters @filters ||= FilterArray[ |