diff --git a/doc-src/content/tutorials/configuration-reference.markdown b/doc-src/content/tutorials/configuration-reference.markdown index 4bed3d25..6c23b991 100644 --- a/doc-src/content/tutorials/configuration-reference.markdown +++ b/doc-src/content/tutorials/configuration-reference.markdown @@ -202,6 +202,13 @@ command line will override the corresponding settings in your configuration file approach. + + disable_warnings + Boolean + + Set this to true to silence deprecation warnings. + + sass_options Hash diff --git a/lib/compass/commands/update_project.rb b/lib/compass/commands/update_project.rb index 1d84185e..2e961c61 100644 --- a/lib/compass/commands/update_project.rb +++ b/lib/compass/commands/update_project.rb @@ -47,10 +47,10 @@ module Compass def new_compiler_instance(additional_options = {}) compiler_opts = Compass.sass_engine_options - compiler_opts.merge!(:quiet => options[:quiet], - :force => options[:force], + compiler_opts.merge!(:force => options[:force], :sass_files => explicit_sass_files, :dry_run => options[:dry_run]) + compiler_opts[:quiet] = options[:quiet] if options[:quiet] compiler_opts.merge!(additional_options) Compass::Compiler.new(working_path, Compass.configuration.sass_path, diff --git a/lib/compass/configuration.rb b/lib/compass/configuration.rb index e3d28978..c51e9a88 100644 --- a/lib/compass/configuration.rb +++ b/lib/compass/configuration.rb @@ -36,7 +36,8 @@ module Compass :asset_cache_buster, :line_comments, :color_output, - :preferred_syntax + :preferred_syntax, + :disable_warnings ].flatten end diff --git a/lib/compass/configuration/adapters.rb b/lib/compass/configuration/adapters.rb index 8df04716..bde7b16d 100644 --- a/lib/compass/configuration/adapters.rb +++ b/lib/compass/configuration/adapters.rb @@ -46,6 +46,7 @@ module Compass engine_opts[:line_comments] = line_comments engine_opts[:cache] = cache engine_opts[:cache_location] = cache_path + engine_opts[:quiet] = disable_warnings if disable_warnings engine_opts.merge!(sass_options || {}) end