Merge branch 'master' into dockerize

Author: vidbina

lib/github-pages/configuration.rb

@@ -119,11 +119,11 @@ def effective_config(user_config)
         config
       end
 
-      # Ensure we're using Kramdown or CommonMarkGhPages.  Force to Kramdown if
+      # Ensure we're using Kramdown or GFM.  Force to Kramdown if
       # neither of these.
       def restrict_markdown_processor(config)
         config["markdown"] = "kramdown" unless \
-          %w(kramdown commonmarkghpages).include?(config["markdown"].to_s.downcase)
+          %w(kramdown gfm).include?(config["markdown"].to_s.downcase)
       end
 
       # Set the site's configuration. Implemented as an `after_reset` hook.

spec/github-pages/configuration_spec.rb

@@ -65,14 +65,14 @@
         end
       end
 
-      context "with CommonMarkGhPages set" do
+      context "with GFM set" do
         let(:site) do
-          config = configuration.merge("markdown" => "CommonMarkGhPages")
+          config = configuration.merge("markdown" => "GFM")
           Jekyll::Site.new(config)
         end
 
         it "keeps the setting" do
-          expect(effective_config["markdown"]).to eql("CommonMarkGhPages")
+          expect(effective_config["markdown"]).to eql("GFM")
         end
       end