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

Remove dependency on sassc #444

Closed
wants to merge 6 commits into from
Closed
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gemspec

# To use debugger
# gem "debugger"
gem "activeadmin"
gem "activeadmin", "~> 2.9.0"
gem "mimemagic", github: "mimemagicrb/mimemagic", ref: "01f92d86d15d85cfd0f20dabd025dcbd36a8a60f"

gem "webpacker", "~> 5.0", require: ENV["SPROCKETS"] != "true"
34 changes: 13 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ PATH
specs:
activeadmin_addons (1.9.0)
active_material
dartsass-rails
railties
redcarpet
require_all
sassc
sassc-rails
xdan-datetimepicker-rails (~> 2.5.1)

GEM
Expand Down Expand Up @@ -61,15 +60,15 @@ GEM
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_material (1.5.2)
activeadmin (2.13.1)
activeadmin (2.9.0)
arbre (~> 1.2, >= 1.2.1)
formtastic (>= 3.1, < 5.0)
formtastic_i18n (~> 0.4)
inherited_resources (~> 1.7)
jquery-rails (~> 4.2)
kaminari (~> 1.0, >= 1.2.1)
railties (>= 6.1, < 7.1)
ransack (>= 2.1.1, < 4)
railties (>= 5.2, < 6.2)
ransack (~> 2.1, >= 2.1.1)
activejob (6.1.7)
activesupport (= 6.1.7)
globalid (>= 0.3.6)
Expand Down Expand Up @@ -115,6 +114,8 @@ GEM
concurrent-ruby (1.1.10)
content_disposition (1.0.0)
crass (1.0.6)
dartsass-rails (0.4.1)
railties (>= 6.0.0)
database_cleaner (1.8.2)
diff-lcs (1.3)
down (5.2.4)
Expand Down Expand Up @@ -148,7 +149,7 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
has_scope (0.8.0)
has_scope (0.8.1)
actionpack (>= 5.2)
activesupport (>= 5.2)
i18n (1.12.0)
Expand Down Expand Up @@ -258,19 +259,19 @@ GEM
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.6)
ransack (3.0.1)
ransack (2.6.0)
activerecord (>= 6.0.4)
activesupport (>= 6.0.4)
i18n
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.5.1)
redcarpet (3.6.0)
regexp_parser (1.6.0)
require_all (3.0.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
responders (3.1.0)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.5)
rspec (3.9.0)
rspec-core (~> 3.9.0)
Expand Down Expand Up @@ -309,14 +310,6 @@ GEM
ffi (~> 1.12)
ruby2_keywords (0.0.5)
rubyzip (2.2.0)
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
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
Expand All @@ -338,7 +331,6 @@ GEM
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (1.2.1)
tilt (2.0.11)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (1.4.1)
Expand Down Expand Up @@ -366,7 +358,7 @@ PLATFORMS

DEPENDENCIES
aasm
activeadmin
activeadmin (~> 2.9.0)
activeadmin_addons!
capybara-selenium
database_cleaner
Expand Down
3 changes: 1 addition & 2 deletions activeadmin_addons.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib,vendor/assets}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]

s.add_dependency "active_material"
s.add_dependency "dartsass-rails"
s.add_dependency "railties"
s.add_dependency "redcarpet"
s.add_dependency "require_all"
s.add_dependency "sassc"
s.add_dependency "sassc-rails"
s.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"

s.add_development_dependency "aasm"
Expand Down
2 changes: 0 additions & 2 deletions lib/activeadmin_addons/engine.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module ActiveAdminAddons
module Rails
class Engine < ::Rails::Engine
require 'sassc'
require 'sassc-rails'
require "xdan-datetimepicker-rails"
require "require_all"
require "active_material"
Expand Down