jekyll 3.1.2 → 3.1.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of jekyll might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/jekyll/commands/serve.rb +7 -6
- data/lib/jekyll/document.rb +1 -1
- data/lib/jekyll/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 29daae6d76fc38cafbe21fabe31445e88fe0464a
|
4
|
+
data.tar.gz: b985ebf8f0ed03fa16bd46a031c7294d2581ea87
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 976d81d83465c53dead23b40de153e81c3cdf4281f977ec8942a73352effd2d9750c9d329ae5dd04332afbfb8f597eda5afa5b88857a4d82a5b4ec6804632236
|
7
|
+
data.tar.gz: 316a5bb0096f088753b928940b2c846fce08f921c8cb720ccd22b48465a9fffa1250b53c935241fb3ebb63b645386a00e209cf38b6e3286643ace43243ff09ad
|
@@ -112,11 +112,12 @@ module Jekyll
|
|
112
112
|
|
113
113
|
private
|
114
114
|
def server_address(server, opts)
|
115
|
-
address
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
115
|
+
"%{prefix}://%{address}:%{port}%{baseurl}" % {
|
116
|
+
:prefix => server.config[:SSLEnable] ? "https" : "http",
|
117
|
+
:baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
|
118
|
+
:address => server.config[:BindAddress],
|
119
|
+
:port => server.config[:Port]
|
120
|
+
}
|
120
121
|
end
|
121
122
|
|
122
123
|
#
|
@@ -181,7 +182,7 @@ module Jekyll
|
|
181
182
|
source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"])
|
182
183
|
opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate))
|
183
184
|
opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key))
|
184
|
-
opts[:
|
185
|
+
opts[:SSLEnable] = true
|
185
186
|
end
|
186
187
|
|
187
188
|
private
|
data/lib/jekyll/document.rb
CHANGED
@@ -259,7 +259,7 @@ module Jekyll
|
|
259
259
|
@data = SafeYAML.load_file(path)
|
260
260
|
else
|
261
261
|
begin
|
262
|
-
defaults = @site.frontmatter_defaults.all(
|
262
|
+
defaults = @site.frontmatter_defaults.all(relative_path, collection.label.to_sym)
|
263
263
|
merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
|
264
264
|
|
265
265
|
self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
|
data/lib/jekyll/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jekyll
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.
|
4
|
+
version: 3.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tom Preston-Werner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-04-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: liquid
|