diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-03 23:34:22 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-04 00:14:42 +0300 |
| commit | a7a02e87cf7ee05287917a48cfebe2d6dfcc9482 (patch) | |
| tree | 662973eff88105e0ac5cb45b95823bb4aefe5e3c | |
| parent | 485af7ea78d78704aba0da48f120b6286980dae2 (diff) | |
Replace unmaintained sass-rails with sassc-rails
closes #8362
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
3 files changed, 9 insertions, 8 deletions
diff --git a/Changelog.md b/Changelog.md index b47beddae..cc24c6d4b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ * Get rid of some uses of "execute\_script" in feature specs [#8331](https://github.com/diaspora/diaspora/pull/8331) * Fix deprecation warnings for sidekiq 7.0 [#8359](https://github.com/diaspora/diaspora/pull/8359) * Remove entypo-rails dependency to prepare for rails 6 [#8361](https://github.com/diaspora/diaspora/pull/8361) +* Remove compass-rails dependency which is not supported anymore [#8362](https://github.com/diaspora/diaspora/pull/8362) ## Bug fixes @@ -62,7 +62,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors" gem "autoprefixer-rails", "10.4.7.0" gem "bootstrap-sass", "3.4.1" gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 -gem "sass-rails", "5.0.7" +gem "sassc-rails", "2.1.2" gem "sprockets-rails", "3.4.2" # Database diff --git a/Gemfile.lock b/Gemfile.lock index e9faba791..2523f2112 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -646,14 +646,14 @@ GEM rubyzip (2.3.2) rugged (1.0.1) 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) 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 sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -889,7 +889,7 @@ DEPENDENCIES rubocop-rails (= 2.9.1) ruby-oembed (= 0.16.1) rubyzip (= 2.3.2) - sass-rails (= 5.0.7) + sassc-rails (= 2.1.2) secure_headers (= 6.3.3) shoulda-matchers (= 4.5.1) sidekiq (= 6.4.2) |