diff --git a/Gemfile b/Gemfile index aaefa0a822..b985918078 100644 --- a/Gemfile +++ b/Gemfile @@ -19,9 +19,6 @@ if ENV['DEPENDENCIES_NEXT'] gem 'awesome_nested_set' gem 'ransack', '2.3.0' gem 'responders' - gem 'sass', '<= 4.7.1' - gem 'sass-rails', '< 6.0.0' - gem 'libv8', '< 8' else gem 'rails', '~> 4.2' @@ -30,8 +27,6 @@ else gem 'awesome_nested_set', '~> 3.3.1' gem 'ransack', '~> 1.8.10' gem 'responders', '~> 2.0' - gem 'sass' - gem 'sass-rails' gem 'db2fog' gem 'unicorn' @@ -120,12 +115,16 @@ gem 'test-unit', '~> 3.3' gem 'coffee-rails', '~> 4.2.2' gem 'compass-rails' +gem 'libv8', '< 8' gem 'mini_racer', '0.2.15' gem 'uglifier', '>= 1.0.3' gem 'angular_rails_csrf' gem 'foundation-icons-sass-rails' +gem 'sass', '<= 4.7.1' +gem 'sass-rails', '< 6.0.0' + gem 'foundation-rails', '= 5.5.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7e09549d40..d3e83d10b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -785,6 +785,7 @@ DEPENDENCIES kaminari (~> 1.2.1) knapsack letter_opener (>= 1.4.1) + libv8 (< 8) mini_racer (= 0.2.15) monetize (~> 1.10) oauth2 (~> 1.4.4) @@ -813,8 +814,8 @@ DEPENDENCIES rswag rubocop rubocop-rails - sass - sass-rails + sass (<= 4.7.1) + sass-rails (< 6.0.0) select2-rails (~> 3.4.7) selenium-webdriver shoulda-matchers