Merge pull request #1739 from douo/patch-1

Fixes #1723
This commit is contained in:
Thomas Reynolds 2016-01-07 11:38:06 -08:00
commit 1e8080b44c

View file

@ -22,7 +22,7 @@ module Middleman
# Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile # Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile
def setup_bundler def setup_bundler
ENV['BUNDLE_GEMFILE'] ||= findup('Gemfile', ENV['MM_ROOT']) ENV['BUNDLE_GEMFILE'] ||= File.join(findup('Gemfile', ENV['MM_ROOT']), "Gemfile")
unless File.exist?(ENV['BUNDLE_GEMFILE']) unless File.exist?(ENV['BUNDLE_GEMFILE'])
ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__) ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)