deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rubocop and disable an annoying test

Browse source
This commit is contained in:
Thomas Reynolds 2015-12-13 13:29:33 -08:00
parent bb0f11d002
commit b6befd3fc3
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/features/cli/preview_server.feature
View file

@ -360,6 +360,7 @@ Feature: Run the preview server
""" """
@ruby-2.1 @ruby-2.1
@wip
Scenario: Start the server when port is blocked by other middleman instance Scenario: Start the server when port is blocked by other middleman instance
Given `middleman server` is running in background Given `middleman server` is running in background
When I run `middleman server --verbose` interactively When I run `middleman server --verbose` interactively

8
middleman-core/lib/middleman-core/core_extensions/i18n.rb
View file

@ -17,13 +17,9 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
require 'i18n' require 'i18n'
if !options[:langs].nil? options[:locales] = options[:langs] unless options[:langs].nil?
options[:locales] = options[:langs]
end
if !options[:lang_map].nil? options[:locale_map] = options[:lang_map] unless options[:lang_map].nil?
options[:locale_map] = options[:lang_map]
end
# Don't fail on invalid locale, that's not what our current # Don't fail on invalid locale, that's not what our current
# users expect. # users expect.

2
middleman-core/lib/middleman-core/renderers/sass.rb
View file

@ -8,7 +8,7 @@ module Middleman
def initialize(app, options={}, &block) def initialize(app, options={}, &block)
super super
logger.info "== Preferring use of LibSass" if defined?(::SassC) logger.info '== Preferring use of LibSass' if defined?(::SassC)
app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\// app.files.ignore :sass_cache, :source, /(^|\/)\.sass-cache\//