From 5adea781c9087689e9e11a57aaff6bbf3921e9f0 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 4 Nov 2016 08:23:33 -0700 Subject: [PATCH] Fix up tests --- .rubocop.yml | 2 ++ Gemfile | 2 +- middleman-core/lib/middleman-core/version.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index dbd74993..c92b709f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -67,3 +67,5 @@ Style/MultilineBlockChain: Enabled: false Style/SpecialGlobalVars: Enabled: false +Style/FrozenStringLiteralComment: + Enabled: false diff --git a/Gemfile b/Gemfile index 491a940d..54dc7b36 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ gem 'rubydns', '~> 1.0.1', require: false # To test javascript gem 'poltergeist', '~> 1.8', require: false -gem 'phantomjs', '~> 1.9.8.0', require: false +gem 'phantomjs', '~> 2.1.1.0', require: false # For less, note there is no compatible JS runtime for windows gem 'therubyrhino', '>= 2.0', platforms: :jruby diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index 6f3f1228..cd959488 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -1,5 +1,5 @@ module Middleman # Current Version # @return [String] - VERSION = '4.1.10'.freeze unless const_defined?(:VERSION) + VERSION = '4.1.11'.freeze unless const_defined?(:VERSION) end