octopress 3.0.5 → 3.0.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8853adf01a49df0352d97c3172b0cd10d83b1ce8
4
- data.tar.gz: 6cff575d97cf58d1dc0ed07e9a32747945d940fa
3
+ metadata.gz: 045208400d680e6ed16483ef0b5d48e1718f59a2
4
+ data.tar.gz: 85ad683ca592253eb8d3d79794a069d317cff2b4
5
5
  SHA512:
6
- metadata.gz: 1ec28f6de5831b7b1993b6d050ef2b7aad371ee670d0cb3cdfe2bbe0b0ba9f4183f29ddf8ae03cb711147121e387beb5c78226a2db20cdb09edab42aee36762d
7
- data.tar.gz: a15844bf5fda99a0a7935e61e97d4bdcce36f01aa3d8b1e20df7c2083dde0201389c32c6328f3523eeadd9dc95926e6a147dc7d9ad41f6633760e1ecba37727d
6
+ metadata.gz: 2b1b39861d32a93c2550fba4afd6a4406d787c62fb4b57310fbb5f0e49fdd239f75cee69a3e30661ac0ce8f2966c921feaaa26e0256a96d806bac76f60ceebc9
7
+ data.tar.gz: ebc71834ef2f837837d2a922d3592ddcd09697ef5cc66bc7ca43b2bd2a75557c723d553e822ea8208eff9a29e3ac22c4dfbb92bfbc1b64c173e6d86f2164eb1b
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.6 (2015-05-26)
4
+ - Fixed issue with Bundler gem loading.
5
+
3
6
  ### 3.0.5 (2015-05-12)
4
7
  - Support for Jekyll 2 & 3
5
8
  - Relaxed version requirements for Jekyll
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.5"
2
+ VERSION = "3.0.6"
3
3
  end
data/lib/octopress.rb CHANGED
@@ -108,9 +108,7 @@ module Octopress
108
108
  if !ENV["OCTOPRESS_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
109
109
  begin
110
110
  require "bundler"
111
- Bundler.require(:default)
112
- Bundler.require(:octopress)
113
- Bundler.require(:jekyll_plugins)
111
+ Bundler.setup(:default, :octopress, :jekyll_plugins)
114
112
  true
115
113
  rescue LoadError, Bundler::GemfileNotFound
116
114
  false
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.5
4
+ version: 3.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-05-12 00:00:00.000000000 Z
12
+ date: 2015-05-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary