summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-07-25 10:59:41 -0400
committerJacob Schatz <jschatz1@gmail.com>2016-07-25 10:59:41 -0400
commit3f8f1871b49a41b0770d27a4a254f98d6a8b0370 (patch)
tree4d568b41b536fd220e9aeaa3e6024309ea70d444
parent720d3be2c4fd4186d320694e869ccf25498edb34 (diff)
downloadgitlab-ce-3f8f1871b49a41b0770d27a4a254f98d6a8b0370.tar.gz
Add es6 gem
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock9
2 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 92e666c1bb7..f2ac74a5976 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'responders', '~> 2.0'
# Specify a sprockets version due to increased performance
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
gem 'sprockets', '~> 3.6.0'
+gem 'sprockets-es6'
# Default values for AR models
gem 'default_value_for', '~> 3.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e2b3d55ee0c..bfa7e38da85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,6 +85,10 @@ GEM
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6)
+ babel-source (5.8.35)
+ babel-transpiler (0.7.0)
+ babel-source (>= 4.0, < 6)
+ execjs (~> 2.0)
babosa (1.0.2)
base32 (0.3.2)
bcrypt (3.1.11)
@@ -700,6 +704,10 @@ GEM
sprockets (3.6.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
+ sprockets-es6 (0.9.0)
+ babel-source (>= 5.8.11)
+ babel-transpiler
+ sprockets (>= 3.0.0)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
@@ -963,6 +971,7 @@ DEPENDENCIES
spring-commands-spinach (~> 1.1.0)
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 3.6.0)
+ sprockets-es6
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
task_list (~> 1.0.2)