Commit 901319fc authored by Jacob Schatz's avatar Jacob Schatz

Merge branch '34831-remove-coffee-rails-gem' into 'master'

Remove coffee-rails gem

Closes #34831

See merge request !12715
parents 47047eae a789ee2d
...@@ -237,7 +237,6 @@ gem 'webpack-rails', '~> 0.9.10' ...@@ -237,7 +237,6 @@ gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
gem 'sass-rails', '~> 5.0.6' gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2' gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.3.8' gem 'addressable', '~> 2.3.8'
......
...@@ -122,13 +122,6 @@ GEM ...@@ -122,13 +122,6 @@ GEM
coderay (1.1.1) coderay (1.1.1)
coercible (1.0.0) coercible (1.0.0)
descendants_tracker (~> 0.0.1) descendants_tracker (~> 0.0.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorize (0.7.7) colorize (0.7.7)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
concurrent-ruby-ext (1.0.5) concurrent-ruby-ext (1.0.5)
...@@ -938,7 +931,6 @@ DEPENDENCIES ...@@ -938,7 +931,6 @@ DEPENDENCIES
charlock_holmes (~> 0.7.3) charlock_holmes (~> 0.7.3)
chronic (~> 0.10.2) chronic (~> 0.10.2)
chronic_duration (~> 0.10.6) chronic_duration (~> 0.10.6)
coffee-rails (~> 4.1.0)
concurrent-ruby (~> 1.0.5) concurrent-ruby (~> 1.0.5)
connection_pool (~> 2.0) connection_pool (~> 2.0)
creole (~> 0.5.0) creole (~> 0.5.0)
......
---
title: Remove coffee-rails gem
merge_request:
author: Takuya Noguchi
...@@ -33,7 +33,6 @@ module GettextI18nRailsJs ...@@ -33,7 +33,6 @@ module GettextI18nRailsJs
[ [
".js", ".js",
".jsx", ".jsx",
".coffee",
".vue" ".vue"
].include? ::File.extname(file) ].include? ::File.extname(file)
end end
......
...@@ -5,7 +5,7 @@ namespace :gettext do ...@@ -5,7 +5,7 @@ namespace :gettext do
# See: https://github.com/grosser/gettext_i18n_rails#customizing-list-of-translatable-files # See: https://github.com/grosser/gettext_i18n_rails#customizing-list-of-translatable-files
def files_to_translate def files_to_translate
folders = %W(app lib config #{locale_path}).join(',') folders = %W(app lib config #{locale_path}).join(',')
exts = %w(rb erb haml slim rhtml js jsx vue coffee handlebars hbs mustache).join(',') exts = %w(rb erb haml slim rhtml js jsx vue handlebars hbs mustache).join(',')
Dir.glob( Dir.glob(
"{#{folders}}/**/*.{#{exts}}" "{#{folders}}/**/*.{#{exts}}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment