Don't set mode AND environment with the same ENV

This commit is contained in:
Thomas Reynolds 2015-09-01 09:58:13 -07:00
parent f76561d101
commit d849930e51

View file

@ -98,11 +98,11 @@ module Middleman
# Middleman mode. Defaults to :server, set to :build by the build process
# @return [String]
define_setting :mode, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :server), 'Middleman mode. Defaults to :server'
define_setting :mode, :server, 'Middleman mode. Defaults to :server'
# Middleman environment. Defaults to :development
# @return [String]
define_setting :environment, :development, 'Middleman environment. Defaults to :development'
define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development'
# Which file should be used for directory indexes
# @return [String]