Merge branch 'go-go-gadget-webpack-ee' into 'master'
Port "Integrate webpack for frontend asset compilation" to EE See merge request !1138
Showing
... | @@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ... | @@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' |
gem 'responders', '~> 2.0' | gem 'responders', '~> 2.0' | ||
gem 'sprockets', '~> 3.7.0' | gem 'sprockets', '~> 3.7.0' | ||
gem 'sprockets-es6', '~> 0.9.2' | |||
# Default values for AR models | # Default values for AR models | ||
gem 'default_value_for', '~> 3.0.0' | gem 'default_value_for', '~> 3.0.0' | ||
... | @@ -229,6 +228,7 @@ gem 'oj', '~> 2.17.4' | ... | @@ -229,6 +228,7 @@ gem 'oj', '~> 2.17.4' |
gem 'chronic', '~> 0.10.2' | gem 'chronic', '~> 0.10.2' | ||
gem 'chronic_duration', '~> 0.10.6' | gem 'chronic_duration', '~> 0.10.6' | ||
gem 'webpack-rails', '~> 0.9.9' | |||
gem 'sass-rails', '~> 5.0.6' | gem 'sass-rails', '~> 5.0.6' | ||
gem 'coffee-rails', '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem 'uglifier', '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
... | @@ -303,13 +303,9 @@ group :development, :test do | ... | @@ -303,13 +303,9 @@ group :development, :test do |
gem 'capybara-screenshot', '~> 1.0.0' | gem 'capybara-screenshot', '~> 1.0.0' | ||
gem 'poltergeist', '~> 1.9.0' | gem 'poltergeist', '~> 1.9.0' | ||
gem 'teaspoon', '~> 1.1.0' | |||
gem 'teaspoon-jasmine', '~> 2.2.0' | |||
gem 'spring', '~> 1.7.0' | gem 'spring', '~> 1.7.0' | ||
gem 'spring-commands-rspec', '~> 1.0.4' | gem 'spring-commands-rspec', '~> 1.0.4' | ||
gem 'spring-commands-spinach', '~> 1.1.0' | gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | |||
gem 'rubocop', '~> 0.46.0', require: false | gem 'rubocop', '~> 0.46.0', require: false | ||
gem 'rubocop-rspec', '~> 1.9.1', require: false | gem 'rubocop-rspec', '~> 1.9.1', require: false | ||
... | @@ -327,6 +323,8 @@ group :development, :test do | ... | @@ -327,6 +323,8 @@ group :development, :test do |
gem 'activerecord_sane_schema_dumper', '0.2' | gem 'activerecord_sane_schema_dumper', '0.2' | ||
gem 'stackprof', '~> 0.2.10' | gem 'stackprof', '~> 0.2.10' | ||
gem 'rack-proxy', '~> 0.6.0' | |||
end | end | ||
group :test do | group :test do | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
bin/teaspoon
deleted
100755 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
config/karma.config.js
0 → 100644
This diff is collapsed.
config/webpack.config.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/teaspoon_env.rb
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment