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

Run CI builds with Sprockets 3.7.2 #1731

Merged
merged 2 commits into from
Feb 24, 2020
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
4 changes: 0 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ Lint/HandleExceptions:
Exclude:
- 'config/initializers/mini_profiler.rb'

Lint/ShadowedException:
Exclude:
- 'lib/alchemy/sass_support.rb'

Style/CollectionMethods:
Enabled: false

Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
gem 'pg', '~> 1.0' if ENV['DB'] == 'postgresql'

group :development, :test do
unless ENV['CI']
if ENV['CI']
gem 'sprockets', '< 4.0' # Sprockets 4 has serious issues with libsass on Linux machines
else
gem 'launchy'
gem 'annotate'
gem 'bumpy'
Expand Down
9 changes: 0 additions & 9 deletions lib/alchemy/sass_support.rb

This file was deleted.

2 changes: 1 addition & 1 deletion lib/alchemy_cms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module Alchemy
require 'ransack'
require 'request_store'
require 'responders'
require 'sassc-rails'
require 'simple_form'
require 'select2-rails'
require 'turbolinks'
Expand Down Expand Up @@ -48,7 +49,6 @@ module Alchemy
require_relative 'alchemy/page_layout'
require_relative 'alchemy/paths'
require_relative 'alchemy/permissions'
require_relative 'alchemy/sass_support'
require_relative 'alchemy/ssl_protection'
require_relative 'alchemy/resource'
require_relative 'alchemy/tinymce'
Expand Down
1 change: 0 additions & 1 deletion spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
# towards the timing of the first feature spec.
start = Time.now
puts "Preloading assets."
Rails.application.assets.cache.clear
Rails.application.precompiled_assets
puts "Done in #{(Time.now - start).round(2)}s"
end
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
require 'codeclimate-test-reporter'
end
SimpleCov.start 'rails' do
add_filter "/lib/alchemy/sass_support"
add_filter "/lib/alchemy/upgrader"
add_filter "/lib/alchemy/version"
add_filter "/lib/rails"
Expand Down