dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3119 from jekyll/fix-bundle-require

This commit is contained in:
Parker Moore 2014-11-22 14:25:07 -08:00
parent cb8a4b4d62 d17b80bf2a
commit 9a94829bcb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/jekyll/plugin_manager.rb
View File

@ -33,11 +33,12 @@ module Jekyll
end end
def self.require_from_bundler def self.require_from_bundler
if ENV["JEKYLL_NO_BUNDLER_REQUIRE"] if ENV["JEKYLL_NO_BUNDLER_REQUIRE"] || !File.file?("Gemfile")
false false
else else
require "bundler" require "bundler"
required_gems = Bundler.require(:jekyll_plugins) Bundler.setup # puts all groups on the load path
required_gems = Bundler.require(:jekyll_plugins) # requires the gems in this group only
Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}") Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true" ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
true true