nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace unmaintained sass-rails with sassc-rails

Browse source 
closes #8362
This commit is contained in:
Benjamin Neff 2022-07-03 22:34:22 +02:00
parent 485af7ea78
commit a7a02e87cf
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -5,6 +5,7 @@
* Get rid of some uses of "execute\_script" in feature specs [#8331](https://github.com/diaspora/diaspora/pull/8331) * 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) * 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 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 ## Bug fixes

2
Gemfile
View file

@ -62,7 +62,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
gem "autoprefixer-rails", "10.4.7.0" gem "autoprefixer-rails", "10.4.7.0"
gem "bootstrap-sass", "3.4.1" 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 "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" gem "sprockets-rails", "3.4.2"
# Database # Database

14
Gemfile.lock
View file

@ -646,14 +646,14 @@ GEM
rubyzip (2.3.2) rubyzip (2.3.2)
rugged (1.0.1) rugged (1.0.1)
sass (3.4.25) 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) sassc (2.4.0)
ffi (~> 1.9) 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) sawyer (0.8.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (> 0.8, < 2.0) faraday (> 0.8, < 2.0)
@ -889,7 +889,7 @@ DEPENDENCIES
rubocop-rails (= 2.9.1) rubocop-rails (= 2.9.1)
ruby-oembed (= 0.16.1) ruby-oembed (= 0.16.1)
rubyzip (= 2.3.2) rubyzip (= 2.3.2)
sass-rails (= 5.0.7) sassc-rails (= 2.1.2)
secure_headers (= 6.3.3) secure_headers (= 6.3.3)
shoulda-matchers (= 4.5.1) shoulda-matchers (= 4.5.1)
sidekiq (= 6.4.2) sidekiq (= 6.4.2)