Release 💎 v3.1.1

History.markdown

@@ -1,20 +1,23 @@
-## HEAD
+## 3.1.1 / 2016-01-29
+
+### Meta
+
+  * Update the Code of Conduct to the latest version (#4402)
 
 ### Bug Fixes
 
-  * Page#dir: ensure it ends in a slash (#4403)
-  * Add Utils.merged_file_read_opts to unify reading & strip the BOM (#4404)
+  * `Page#dir`: ensure it ends in a slash (#4403)
+  * Add `Utils.merged_file_read_opts` to unify reading & strip the BOM (#4404)
+  * `Renderer#output_ext`: honor folders when looking for ext (#4401)
 
 ### Development Fixes
 
-  * Renderer#output_ext: honor folders when looking for ext (#4401)
   * Suppress stdout in liquid profiling test (#4409)
 
 ## 3.1.0 / 2016-01-23
 
 ### Minor Enhancements
 
-  * Update the Code of Conduct to the latest version (#4402)
   * Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` (#4277)
   * Add 'sample' Liquid filter Equivalent to Array#sample functionality (#4223)
   * Cache parsed include file to save liquid parsing time. (#4120)

lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

rake/site.rake

@@ -5,8 +5,10 @@
 #############################################################################
 
 namespace :site do
+  task :generated_pages => [:history, :version_file, :conduct]
+
   desc "Generate and view the site locally"
-  task :preview => [:history, :version_file] do
+  task :preview => :generated_pages do
     require "launchy"
     require "jekyll"
 
@@ -31,7 +33,7 @@ namespace :site do
   end
 
   desc "Generate the site"
-  task :generate => [:history, :version_file] do
+  task :generate => :generated_pages do
     require "jekyll"
     Jekyll::Commands::Build.process({
       "source"      => File.expand_path("site"),
@@ -50,7 +52,7 @@ namespace :site do
   end
 
   desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
-  task :publish => [:history, :version_file] do
+  task :publish => :generated_pages do
     # Ensure the gh-pages dir exists so we can generate into it.
     puts "Checking for gh-pages dir..."
     unless File.exist?("./gh-pages")
@@ -119,6 +121,25 @@ namespace :site do
     end
   end
 
+  desc "Copy the Code of Conduct"
+  task :conduct do
+    code_of_conduct = File.read("CONDUCT.md")
+    header, _, body = code_of_conduct.partition("\n\n")
+    front_matter = {
+      "layout"        => "docs",
+      "title"         => header.sub('# Contributor ', ''),
+      "permalink"     => "/docs/conduct/",
+      "redirect_from" => "/conduct/index.html",
+      "editable"      => false
+    }
+    Dir.chdir('site/_docs') do
+      File.open("conduct.md", "w") do |file|
+        file.write("#{front_matter.to_yaml}---\n\n")
+        file.write(body)
+      end
+    end
+  end
+
   desc "Write the site latest_version.txt file"
   task :version_file do
     File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i

site/_data/docs.yml

@@ -45,4 +45,5 @@
 - title: Meta
   docs:
   - contributing
+  - conduct
   - history

site/_docs/conduct.md

@@ -0,0 +1,55 @@
+---
+layout: docs
+title: Code of Conduct
+permalink: "/docs/conduct/"
+redirect_from: "/conduct/index.html"
+editable: false
+---
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting a project maintainer. All complaints
+will be reviewed and investigated and will result in a response that is deemed
+necessary and appropriate to the circumstances. Maintainers are obligated to
+maintain confidentiality with regard to the reporter of an incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

site/_docs/history.md

@@ -4,13 +4,32 @@ title: History
 permalink: "/docs/history/"
 ---
 
+## 3.1.1 / 2016-01-29
+{: #v3-1-1}
+
+### Meta
+
+- Update the Code of Conduct to the latest version ([#4402]({{ site.repository }}/issues/4402))
+
+### Bug Fixes
+{: #bug-fixes-v3-1-1}
+
+- `Page#dir`: ensure it ends in a slash ([#4403]({{ site.repository }}/issues/4403))
+- Add `Utils.merged_file_read_opts` to unify reading & strip the BOM ([#4404]({{ site.repository }}/issues/4404))
+- `Renderer#output_ext`: honor folders when looking for ext ([#4401]({{ site.repository }}/issues/4401))
+
+### Development Fixes
+{: #development-fixes-v3-1-1}
+
+- Suppress stdout in liquid profiling test ([#4409]({{ site.repository }}/issues/4409))
+
+
 ## 3.1.0 / 2016-01-23
 {: #v3-1-0}
 
 ### Minor Enhancements
 {: #minor-enhancements-v3-1-0}
 
-- Update the Code of Conduct to the latest version ([#4402]({{ site.repository }}/issues/4402))
 - Use `Liquid::Drop`s instead of `Hash`es in `#to_liquid` ([#4277]({{ site.repository }}/issues/4277))
 - Add 'sample' Liquid filter Equivalent to Array#sample functionality ([#4223]({{ site.repository }}/issues/4223))
 - Cache parsed include file to save liquid parsing time. ([#4120]({{ site.repository }}/issues/4120))

site/_posts/2016-01-28-jekyll-3-1-1-released.markdown

@@ -0,0 +1,31 @@
+---
+layout: news_item
+title: 'Jekyll 3.1.1 Released'
+date: 2016-01-28 17:21:50 -0800
+author: parkr
+version: 3.1.1
+categories: [release]
+---
+
+This release squashes a few bugs :bug: :bug: :bug: noticed by a few
+wonderful Jekyll users:
+
+* If your `permalink` ended with a `/`, your URL didn't have any extension,
+even if you wanted one
+* We now strip the BOM by default per Ruby's `IO.open`.
+* `page.dir` will not always end in a slash.
+
+We also updated our [Code of Conduct](/conduct/) to the latest version of
+the Contributor Covenant. The update includes language to ensure that the
+reporter of the incident remains confidential to non-maintainers and that
+all complaints will result in an appropriate response. I care deeply about
+Jekyll's community and will do everything in my power to ensure it is a
+welcoming community. Feel free to reach out to me directly if you feel
+there is a way we can improve the community for everyone!
+
+See links to the PR's on [the history page](/docs/history/#v3-1-1).
+
+Thanks to Jordon Bedwell, chrisfinazzo, Kroum Tzanev, David Celis, and
+Alfred Xing for their commits on this latest release! :sparkles:
+
+Happy Jekylling!