diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-07-17 21:18:55 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-07-17 21:18:55 +0000 |
| commit | 901319fc692627e0d4d58f52ea2801597547d444 (patch) | |
| tree | 632f5e77e451a58eb9c2e46d7d4564a6468a8a97 | |
| parent | 47047eae4e207ffb7f19034f800ba7c2dc629291 (diff) | |
| parent | a789ee2d1fd1c66c84ee51f49da2d8dcea7924ec (diff) | |
| download | gitlab-ce-901319fc692627e0d4d58f52ea2801597547d444.tar.gz | |
Merge branch '34831-remove-coffee-rails-gem' into 'master'
Remove coffee-rails gem
Closes #34831
See merge request !12715
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/34831-remove-coffee-rails-gem.yml | 4 | ||||
| -rw-r--r-- | config/initializers/gettext_rails_i18n_patch.rb | 1 | ||||
| -rw-r--r-- | lib/tasks/gettext.rake | 2 |
5 files changed, 5 insertions, 11 deletions
@@ -237,7 +237,6 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sass-rails', '~> 5.0.6' -gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.3.8' diff --git a/Gemfile.lock b/Gemfile.lock index e25a7d16461..a24636ad512 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,13 +122,6 @@ GEM coderay (1.1.1) coercible (1.0.0) 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) concurrent-ruby (1.0.5) concurrent-ruby-ext (1.0.5) @@ -938,7 +931,6 @@ DEPENDENCIES charlock_holmes (~> 0.7.3) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) concurrent-ruby (~> 1.0.5) connection_pool (~> 2.0) creole (~> 0.5.0) diff --git a/changelogs/unreleased/34831-remove-coffee-rails-gem.yml b/changelogs/unreleased/34831-remove-coffee-rails-gem.yml new file mode 100644 index 00000000000..b555f112b8d --- /dev/null +++ b/changelogs/unreleased/34831-remove-coffee-rails-gem.yml @@ -0,0 +1,4 @@ +--- +title: Remove coffee-rails gem +merge_request: +author: Takuya Noguchi diff --git a/config/initializers/gettext_rails_i18n_patch.rb b/config/initializers/gettext_rails_i18n_patch.rb index 69118f464ca..377e5104f9d 100644 --- a/config/initializers/gettext_rails_i18n_patch.rb +++ b/config/initializers/gettext_rails_i18n_patch.rb @@ -33,7 +33,6 @@ module GettextI18nRailsJs [ ".js", ".jsx", - ".coffee", ".vue" ].include? ::File.extname(file) end diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index b27f7475115..b48e4dce445 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -5,7 +5,7 @@ namespace :gettext do # See: https://github.com/grosser/gettext_i18n_rails#customizing-list-of-translatable-files def files_to_translate 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( "{#{folders}}/**/*.{#{exts}}" |