Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing sass-rails with sassc-rails #3156

Merged
merged 8 commits into from
Jun 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
appraise "rails-5.0" do
gem 'rails', '~> 5.0.0'
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails', '~> 2.1'
gem 'devise', '~> 4.0'

group :test do
Expand Down Expand Up @@ -33,7 +33,7 @@ end

appraise "rails-5.1" do
gem 'rails', '~> 5.1.0'
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails', '~> 2.1'
gem 'devise', '~> 4.0'

group :test do
Expand Down Expand Up @@ -63,7 +63,7 @@ end

appraise "rails-5.2" do
gem 'rails', '~> 5.2.0'
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails', '~> 2.1'
gem 'devise', '~> 4.4'

group :test do
Expand Down Expand Up @@ -94,7 +94,7 @@ end
appraise "rails-6.0" do
gem 'rails', '~> 6.0.0.rc1'
gem 'haml', github: 'haml/haml'
gem 'sass-rails', ['>= 6.0.0.beta3', '< 7']
gem 'sassc-rails', '~> 2.1'
gem 'devise', '~> 4.4'

group :test do
Expand All @@ -110,7 +110,7 @@ end

appraise "cancan" do
gem 'rails', '~> 5.1.0'
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails', '~> 2.1'
gem 'devise', '~> 4.0'

group :test do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/cancan.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0"
gem "rails", "~> 5.1.0"
gem "haml"
gem "devise", "~> 4.0"
gem "sass-rails", "~> 5.0"
gem "sassc-rails", "~> 2.1"

group :active_record do
gem "paper_trail"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0"
gem "rails", "~> 5.0.0"
gem "haml"
gem "devise", "~> 4.0"
gem "sass-rails", "~> 5.0"
gem "sassc-rails", "~> 2.1"

group :active_record do
gem "paper_trail", ">= 5.0"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0"
gem "rails", "~> 5.1.0"
gem "haml"
gem "devise", "~> 4.0"
gem "sass-rails", "~> 5.0"
gem "sassc-rails", "~> 2.1"

group :active_record do
gem "paper_trail", ">= 5.0"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0"
gem "rails", "~> 5.2.0"
gem "haml"
gem "devise", "~> 4.4"
gem "sass-rails", "~> 5.0"
gem "sassc-rails", "~> 2.1"

group :active_record do
gem "paper_trail", ">= 5.0"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "appraisal", ">= 2.0"
gem "rails", "~> 6.0.0.rc1"
gem "haml", github: "haml/haml"
gem "devise", "~> 4.4"
gem "sass-rails", [">= 6.0.0.beta3", "< 7"]
gem "sassc-rails", "~> 2.1"

group :active_record do
gem "paper_trail", ">= 5.0"
Expand Down
2 changes: 1 addition & 1 deletion lib/rails_admin/bootstrap-sass.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def self.load!
require 'rails_admin/bootstrap-sass/sass_functions'
end

require 'sass-rails' if rails?
require 'sassc-rails' if rails?

unless rails? || compass?
raise(Bootstrap::FrameworkNotFound.new('bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'))
Expand Down
2 changes: 1 addition & 1 deletion rails_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'rack-pjax', '>= 0.7'
spec.add_dependency 'rails', ['>= 5.0', '< 7']
spec.add_dependency 'remotipart', '~> 1.3'
spec.add_dependency 'sass-rails', ['>= 4.0', '< 7']
spec.add_dependency 'sassc-rails', ['>= 1.3', '< 3']
spec.add_dependency 'activemodel-serializers-xml', '>= 1.0'
spec.add_development_dependency 'bundler', '>= 1.0'
spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech', 'Mitsuhiro Shibuya']
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy_app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '>= 6.0.0.beta'
gem 'sassc-rails', '~> 2.1'
gem 'coffee-rails', '~> 4.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
SimpleCov.start do
add_filter '/spec/'
add_filter '/vendor/bundle/'
minimum_coverage(CI_ORM == :mongoid ? 90.08 : 91.21)
minimum_coverage(CI_ORM == :mongoid ? 90.05 : 91.21)
end

require File.expand_path('../dummy_app/config/environment', __FILE__)
Expand Down