summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-07-07 21:47:08 +0900
committerTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-07-08 00:26:05 +0900
commitf15c9525ef26683f5beca49a736d7e98378f2a8c (patch)
treec2349e01ef51d119d374427ee877d9ad9d67f17d
parentde2d5ce685877249434ba412b5839910bc703882 (diff)
downloadgitlab-ce-f15c9525ef26683f5beca49a736d7e98378f2a8c.tar.gz
Remove coffee-rails gem
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock8
-rw-r--r--changelogs/unreleased/34831-remove-coffee-rails-gem.yml4
3 files changed, 4 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile
index 7814de99fb2..16406b995fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -238,7 +238,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 70abc0669df..2a8ff8c4cc7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -124,13 +124,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)
@@ -943,7 +936,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