Merge branch 'go-go-gadget-webpack' into go-go-gadget-webpack-ee
* go-go-gadget-webpack: (90 commits) add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget fix duplicate data-toggle attribute update rake tasks fix frontend tests remove sprockets-es6 and execjs dependencies Improved code style on the issue_sidebar_spec.rb add CHAGELOG.md entry for !8831 remove assets:compile step from relative_url docs update scripts and docs to reference the newly namespaced rake task namespace assets rake tasks to gitlab:assets:* correct gzip files if they exist as well automatically correct CSS urls on assets:precompile remove hard-coded assets path for ace editor modules Fixed cancel button in the services form not redirecting back to the integrations settings view Fix search bar search param encoding Fix a transient failure in the `Explore::ProjectsController` spec Fix filtering with multiple words Fix project name label's for reference in project settings ...
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' | ||
... | @@ -291,6 +291,7 @@ group :development, :test do | ... | @@ -291,6 +291,7 @@ group :development, :test do |
gem 'rspec-retry', '~> 0.4.5' | gem 'rspec-retry', '~> 0.4.5' | ||
gem 'spinach-rails', '~> 0.2.1' | gem 'spinach-rails', '~> 0.2.1' | ||
gem 'spinach-rerun-reporter', '~> 0.0.2' | gem 'spinach-rerun-reporter', '~> 0.0.2' | ||
gem 'rspec_profiling' | |||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) | # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) | ||
gem 'minitest', '~> 5.7.0' | gem 'minitest', '~> 5.7.0' | ||
... | @@ -302,13 +303,9 @@ group :development, :test do | ... | @@ -302,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 | ||
... | ... |
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.
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.
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.
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.
lib/tasks/gitlab/assets.rake
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.
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.
This diff is collapsed.
Please register or sign in to comment