Merge branch 'master' into 'master'

Update to jekyll 4.0.0

See merge request pages/jekyll!42

.gitignore

@@ -1,4 +1,5 @@
 _site
 .sass-cache
+.jekyll-cache
 .jekyll-metadata
-public/
+vendor

.gitlab-ci.yml

@@ -1,10 +1,11 @@
-image: ruby:2.3
+image: ruby:latest
 
 variables:
   JEKYLL_ENV: production
   LC_ALL: C.UTF-8
 
 before_script:
+  - gem install bundler
   - bundle install
 
 test:

404.html

@@ -0,0 +1,25 @@
+---
+permalink: /404.html
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>

Gemfile

@@ -1,9 +1,30 @@
 source "https://rubygems.org"
-ruby RUBY_VERSION
+# Hello! This is where you manage which Jekyll version is used to run.
-
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
 # This will help ensure the proper Jekyll version is running.
-gem "jekyll", "3.4.0"
+# Happy Jekylling!
+gem "jekyll", "~> 4.0.0"
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.5"
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.12"
+end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+# and associated library.
+install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+  gem "tzinfo", "~> 1.2"
+  gem "tzinfo-data"
+end
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
 

Gemfile.lock

@@ -1,51 +1,84 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.7.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    ffi (1.9.17)
+    concurrent-ruby (1.1.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.11.3)
     forwardable-extended (2.6.0)
-    jekyll (3.4.0)
+    http_parser.rb (0.6.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.0.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
+      em-websocket (~> 0.5)
-      jekyll-watch (~> 1.1)
+      i18n (>= 0.9.5, < 2)
-      kramdown (~> 1.3)
+      jekyll-sass-converter (~> 2.0)
-      liquid (~> 3.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.0)
+      terminal-table (~> 1.8)
-      sass (~> 3.4)
+    jekyll-feed (0.13.0)
-    jekyll-watch (1.5.0)
+      jekyll (>= 3.7, < 5.0)
-      listen (~> 3.0, < 3.1)
+    jekyll-sass-converter (2.0.1)
-    kramdown (1.13.2)
+      sassc (> 2.0.1, < 3.0)
-    liquid (3.0.6)
+    jekyll-seo-tag (2.6.1)
-    listen (3.0.8)
+      jekyll (>= 3.3, < 5.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
+    jekyll-watch (2.2.1)
-      rb-inotify (~> 0.9, >= 0.9.7)
+      listen (~> 3.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    pathutil (0.14.0)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
+    public_suffix (4.0.1)
-    rb-fsevent (0.9.8)
+    rb-fsevent (0.10.3)
-    rb-inotify (0.9.8)
+    rb-inotify (0.10.0)
-      ffi (>= 0.5.0)
+      ffi (~> 1.0)
-    rouge (1.11.1)
+    rouge (3.14.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
-    sass (3.4.23)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.6.0)
+    wdm (0.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (= 3.4.0)
+  jekyll (~> 4.0.0)
+  jekyll-feed (~> 0.12)
+  minima (~> 2.5)
+  tzinfo (~> 1.2)
   tzinfo-data
-
+  wdm (~> 0.1.1)
-RUBY VERSION
-   ruby 2.3.1p112
 
 BUNDLED WITH
-   1.13.6
+   2.0.2

_config.yml

@@ -1,26 +1,56 @@
 # Welcome to Jekyll!
 #
 # This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely need to edit after that.
+# which you are expected to set up once and rarely edit after that. If you find
+# yourself editing this file very often, consider using Jekyll's data files
+# feature for the data you need to update frequently.
+#
 # For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'jekyll serve'. If you change this file, please restart the server process.
+# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-
+#
+# If you need help with YAML syntax, here are some quick references for you: 
+# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
+# https://learnxinyminutes.com/docs/yaml/
+#
 # Site settings
+# These are used to personalize your new site. If you look in the HTML files,
+# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
+# You can create any custom variable you would like, and they will be accessible
+# in the templates via {{ site.myvariable }}.
+
 title: Example Jekyll site using GitLab Pages
 email: your-email@domain.com
-description: > # this means to ignore newlines until "baseurl:"
+description: >- # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.
 baseurl: "/jekyll" # the subpath of your site, e.g. /blog
-url: "/" # the base hostname & protocol for your site
+url: "/" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: jekyllrb
 github_username:  jekyll
 gitlab_username:  pages
 
-# Outputting
-permalink: /:categories/:year/:month/:day/:title
-
 # Build settings
-markdown: kramdown
+theme: minima
-exclude: ["README.md"]
+plugins:
+  - jekyll-feed
+
+# Exclude from processing.
+# The following items will not be processed, by default.
+# Any item listed under the `exclude:` key here will be automatically added to
+# the internal "default list".
+#
+# Excluded items can be processed by explicitly listing the directories or
+# their entries' file path in the `include:` list.
+#
+# exclude:
+#   - .sass-cache/
+#   - .jekyll-cache/
+#   - gemfiles/
+#   - Gemfile
+#   - Gemfile.lock
+#   - node_modules/
+#   - vendor/bundle/
+#   - vendor/cache/
+#   - vendor/gems/
+#   - vendor/ruby/

about.md

@@ -4,11 +4,11 @@ title: About
 permalink: /about/
 ---
 
-This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
+This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/)
 
 You can find the source code for the Jekyll new theme at:
-{% include icon-github.html username="jglovier" %} /
+{% include icon-github.html username="jekyll" %} /
-[jekyll-new](https://github.com/jglovier/jekyll-new)
+[minima](https://github.com/jekyll/minima)
 
 You can find the source code for Jekyll at
 {% include icon-github.html username="jekyll" %} /