Merge branch 'master' into patch-1

.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
 before_install: gem install bundler
 language: ruby
 script: script/cibuild

History.markdown

@@ -1,13 +1,35 @@
 ## HEAD
 
+  * Docs: Prevent GitHub Pages from processing Liquid raw tag (#276)
+
+### Documentation
+
+  * Use gems config key for Jekyll < 3.5.0 (#255)
+
+### Development Fixes
+
+  * Test against Ruby 2.5 (#260)
+
+### Minor Enhancements
+
+  * Add webmaster_verifications for baidu (#263)
+
+## 2.4.0 / 2017-12-04
+
+### Minor
+
+  * Add meta generator (#236)
+  * Consistently use self-closing tags (#246)
+  * Strip null values from JSON-LD hash (#249)
+
 ### Documentation
 
   * Avoid deprecation warning when building docs (#243)
 
 ### Development Fixes
 
-  * Travis: Test against Rubies (#242)
-  * Try testing on Ruby v2.3 and 2.4 (#181)
+  * Test against latest Rubies (#242)
+  * Use Nokigiri on CI (#181)
 
 ## 2.3.0
 

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Ben Balter
+Copyright (c) 2015-present Ben Balter and the jekyll-seo-tag contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/advanced-usage.md

@@ -6,9 +6,11 @@ Jekyll SEO Tag is designed to implement SEO best practices by default and to be
 
 If for some reason, you don't want the plugin to output `<title>` tags on each page, simply invoke the plugin within your template like so:
 
+<!-- {% raw %} -->
 ```
 {% seo title=false %}
 ```
+<!-- {% endraw %} -->
 
 ### Author information
 

docs/installation.md

@@ -13,8 +13,12 @@
     - jekyll-seo-tag
   ```
 
+If you are using a Jekyll version less than `3.5.0`, use the `gems` key instead of `plugins`.
+
 3. Add the following right before `</head>` in your site's template(s):
 
+<!-- {% raw %} -->
   ```liquid
   {% seo %}
   ```
+<!-- {% endraw %} -->

docs/usage.md

@@ -54,6 +54,7 @@ webmaster_verifications:
   bing: 1234
   alexa: 1234
   yandex: 1234
+  baidu: 1234
 ```
 
 * `lang` - The locale these tags are marked up in. Of the format `language_TERRITORY`. Default is `en_US`.

jekyll-seo-tag.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "html-proofer", "~> 3.7"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rubocop", "~> 0.5"
+  spec.add_development_dependency "rubocop", "0.51"
 end

lib/jekyll-seo-tag/version.rb

@@ -5,6 +5,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class SeoTag < Liquid::Tag
-    VERSION = "2.3.0".freeze
+    VERSION = "2.4.0".freeze
   end
 end

lib/template.html

@@ -95,6 +95,10 @@
   {% if site.webmaster_verifications.yandex %}
     <meta name="yandex-verification" content="{{ site.webmaster_verifications.yandex }}" />
   {% endif %}
+
+  {% if site.webmaster_verifications.baidu %}
+    <meta name="baidu-site-verification" content="{{ site.webmaster_verifications.baidu }}" />
+  {% endif %}
 {% elsif site.google_site_verification %}
   <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
 {% endif %}