diff --git a/Gemfile b/Gemfile
index 80f4e20c3e4..f47ce51dc36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'awesome_nested_set'
 gem 'ransack', '2.3.0'
 gem 'responders'
 gem 'sass', '<= 4.7.1'
-gem 'sass-rails', '< 6.0.0'
+gem 'sass-rails', '< 7.0.0'
 
 gem 'i18n'
 gem 'i18n-js', '~> 3.8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index d32447e677a..fa2bb35b434 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -495,12 +495,16 @@ GEM
     ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     sass (3.4.25)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     select2-rails (3.4.9)
       sass-rails
       thor (~> 0.14)
@@ -680,7 +684,7 @@ DEPENDENCIES
   rubocop
   rubocop-rails
   sass (<= 4.7.1)
-  sass-rails (< 6.0.0)
+  sass-rails (< 7.0.0)
   select2-rails (~> 3.4.7)
   selenium-webdriver
   shoulda-matchers