From 34de676713b28586abfdbd23df75fb457cb4f364 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 1 Sep 2014 12:30:15 -0700
Subject: [PATCH] Require gems in :jekyll_plugins group in a Gemfile in unsafe
 mode.

Replaces #1658. /cc @imathis
---
 lib/jekyll/plugin_manager.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/jekyll/plugin_manager.rb b/lib/jekyll/plugin_manager.rb
index c52a5205..394aa9d6 100644
--- a/lib/jekyll/plugin_manager.rb
+++ b/lib/jekyll/plugin_manager.rb
@@ -17,6 +17,7 @@ module Jekyll
     def conscientious_require
       require_plugin_files
       require_gems
+      require_from_bundler
     end
 
     # Require each of the gem plugins specified.
@@ -30,6 +31,15 @@ module Jekyll
       end
     end
 
+    def require_from_bundler
+      unless site.safe
+        require "bundler/setup"
+        Bundler.require(:jekyll_plugins)
+      end
+    rescue LoadError
+      false
+    end
+
     # Check whether a gem plugin is allowed to be used during this build.
     #
     # gem_name - the name of the gem