Skip to content

Commit c14d8e9

Browse files
authored
Merge pull request #292 from f1sherman/sassc
Replace EOL'd sass with sassc
2 parents 37bcaf5 + 87ec4d4 commit c14d8e9

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

Gemfile.lock

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PATH
2222
active_material
2323
railties
2424
require_all (~> 1.5)
25-
sass
25+
sassc
2626
select2-rails (~> 4.0)
2727
xdan-datetimepicker-rails (~> 2.5.1)
2828

@@ -266,12 +266,14 @@ GEM
266266
sass-listen (4.0.0)
267267
rb-fsevent (~> 0.9, >= 0.9.4)
268268
rb-inotify (~> 0.9, >= 0.9.7)
269-
sass-rails (5.0.7)
270-
railties (>= 4.0.0, < 6)
271-
sass (~> 3.1)
272-
sprockets (>= 2.8, < 4.0)
273-
sprockets-rails (>= 2.0, < 4.0)
274-
tilt (>= 1.1, < 3)
269+
sassc (2.2.1)
270+
ffi (~> 1.9)
271+
sassc-rails (2.1.2)
272+
railties (>= 4.0.0)
273+
sassc (>= 2.0)
274+
sprockets (> 3.0)
275+
sprockets-rails
276+
tilt
275277
select2-rails (4.0.3)
276278
thor (~> 0.14)
277279
selenium-webdriver (3.142.7)
@@ -294,7 +296,7 @@ GEM
294296
sqlite3 (1.3.13)
295297
thor (0.20.3)
296298
thread_safe (0.3.6)
297-
tilt (2.0.8)
299+
tilt (2.0.10)
298300
tzinfo (1.2.6)
299301
thread_safe (~> 0.1)
300302
warden (1.2.7)
@@ -327,7 +329,7 @@ DEPENDENCIES
327329
pry-rails
328330
rails (~> 4.2)
329331
rspec-rails
330-
sass-rails
332+
sassc-rails
331333
shoulda-matchers
332334
sqlite3
333335
webdrivers

activeadmin_addons.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Gem::Specification.new do |s|
1919
s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
2020

2121
s.add_dependency "railties"
22-
s.add_dependency "sass"
22+
s.add_dependency "sassc"
2323
s.add_dependency "select2-rails", "~> 4.0"
2424
s.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
2525
s.add_dependency "require_all", "~> 1.5"
2626
s.add_dependency "active_material"
2727

2828
s.add_development_dependency "rails", "~> 4.2"
2929
s.add_development_dependency "sqlite3"
30-
s.add_development_dependency "sass-rails"
30+
s.add_development_dependency "sassc-rails"
3131
s.add_development_dependency "enumerize", "~> 2.0"
3232
s.add_development_dependency "paperclip"
3333
s.add_development_dependency "aasm"

lib/activeadmin_addons/engine.rb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@ module ActiveAdminAddons
22
module Rails
33
class Engine < ::Rails::Engine
44
require "select2-rails"
5-
require "sass"
6-
begin
7-
require 'sassc-rails'
8-
rescue LoadError
9-
begin
10-
require 'sass-rails'
11-
rescue LoadError
12-
raise "Couldn't find 'sass-rails' or 'sassc-rails' gems in your application."
13-
end
14-
end
5+
require 'sassc'
6+
require 'sassc-rails'
157
require "xdan-datetimepicker-rails"
168
require "require_all"
179
require "active_material"

0 commit comments

Comments
 (0)