Merge pull request #1031 from DirtyF/redirects

Fix redirects

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -13,79 +13,81 @@ GEM
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.9)
+    commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concurrent-ruby (1.0.5)
+    dnsruby (1.61.2)
+      addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.14.0)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    github-pages (180)
+    github-pages (192)
-      activesupport (= 4.2.9)
+      activesupport (= 4.2.10)
-      github-pages-health-check (= 1.4.0)
+      github-pages-health-check (= 1.8.1)
-      jekyll (= 3.7.3)
+      jekyll (= 3.7.4)
-      jekyll-avatar (= 0.5.0)
+      jekyll-avatar (= 0.6.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.5)
       jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.9.3)
+      jekyll-feed (= 0.10.0)
       jekyll-gist (= 1.5.0)
       jekyll-github-metadata (= 2.9.4)
-      jekyll-mentions (= 1.3.0)
+      jekyll-mentions (= 1.4.1)
       jekyll-optional-front-matter (= 0.3.0)
       jekyll-paginate (= 1.1.0)
       jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.13.0)
+      jekyll-redirect-from (= 0.14.0)
       jekyll-relative-links (= 0.5.3)
-      jekyll-remote-theme (= 0.2.3)
+      jekyll-remote-theme (= 0.3.1)
       jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.4.0)
+      jekyll-seo-tag (= 2.5.0)
       jekyll-sitemap (= 1.2.0)
       jekyll-swiss (= 0.4.0)
-      jekyll-theme-architect (= 0.1.0)
+      jekyll-theme-architect (= 0.1.1)
-      jekyll-theme-cayman (= 0.1.0)
+      jekyll-theme-cayman (= 0.1.1)
-      jekyll-theme-dinky (= 0.1.0)
+      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.0)
+      jekyll-theme-hacker (= 0.1.1)
-      jekyll-theme-leap-day (= 0.1.0)
+      jekyll-theme-leap-day (= 0.1.1)
-      jekyll-theme-merlot (= 0.1.0)
+      jekyll-theme-merlot (= 0.1.1)
-      jekyll-theme-midnight (= 0.1.0)
+      jekyll-theme-midnight (= 0.1.1)
-      jekyll-theme-minimal (= 0.1.0)
+      jekyll-theme-minimal (= 0.1.1)
-      jekyll-theme-modernist (= 0.1.0)
+      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.2)
+      jekyll-theme-primer (= 0.5.3)
-      jekyll-theme-slate (= 0.1.0)
+      jekyll-theme-slate (= 0.1.1)
-      jekyll-theme-tactile (= 0.1.0)
+      jekyll-theme-tactile (= 0.1.1)
-      jekyll-theme-time-machine (= 0.1.0)
+      jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.9.0)
+      jemoji (= 0.10.1)
-      kramdown (= 1.16.2)
+      kramdown (= 1.17.0)
       liquid (= 4.0.0)
       listen (= 3.1.5)
       mercenary (~> 0.3)
-      minima (= 2.4.0)
+      minima (= 2.5.0)
-      nokogiri (>= 1.8.1, < 2.0)
+      nokogiri (>= 1.8.2, < 2.0)
       rouge (= 2.2.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.4.0)
+    github-pages-health-check (1.8.1)
       addressable (~> 2.3)
-      net-dns (~> 0.8)
+      dnsruby (~> 1.60)
       octokit (~> 4.0)
       public_suffix (~> 2.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.7.1)
+    html-pipeline (2.8.4)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.3)
+    jekyll (3.7.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -98,12 +100,12 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.5.0)
+    jekyll-avatar (0.6.0)
       jekyll (~> 3.0)
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.1.0)
+    jekyll-commonmark (1.2.0)
       commonmarker (~> 0.14)
       jekyll (>= 3.0, < 4.0)
     jekyll-commonmark-ghpages (0.1.5)
@@ -112,15 +114,14 @@ GEM
       rouge (~> 2)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.9.3)
+    jekyll-feed (0.10.0)
       jekyll (~> 3.3)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-github-metadata (2.9.4)
       jekyll (~> 3.1)
       octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.3.0)
+    jekyll-mentions (1.4.1)
-      activesupport (~> 4.0)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
     jekyll-optional-front-matter (0.3.0)
@@ -128,71 +129,69 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-readme-index (0.2.0)
       jekyll (~> 3.0)
-    jekyll-redirect-from (0.13.0)
+    jekyll-redirect-from (0.14.0)
       jekyll (~> 3.3)
     jekyll-relative-links (0.5.3)
       jekyll (~> 3.3)
-    jekyll-remote-theme (0.2.3)
+    jekyll-remote-theme (0.3.1)
       jekyll (~> 3.5)
       rubyzip (>= 1.2.1, < 3.0)
-      typhoeus (>= 0.7, < 2.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.4.0)
+    jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
     jekyll-swiss (0.4.0)
-    jekyll-theme-architect (0.1.0)
+    jekyll-theme-architect (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.1.0)
+    jekyll-theme-cayman (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.1.0)
+    jekyll-theme-dinky (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.0)
+    jekyll-theme-hacker (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.1.0)
+    jekyll-theme-leap-day (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.1.0)
+    jekyll-theme-merlot (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.1.0)
+    jekyll-theme-midnight (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.1.0)
+    jekyll-theme-minimal (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.1.0)
+    jekyll-theme-modernist (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.2)
+    jekyll-theme-primer (0.5.3)
       jekyll (~> 3.5)
       jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.2)
+      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.1.0)
+    jekyll-theme-slate (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.1.0)
+    jekyll-theme-tactile (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.1.0)
+    jekyll-theme-time-machine (0.1.1)
       jekyll (~> 3.5)
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    jemoji (0.9.0)
+    jemoji (0.10.1)
-      activesupport (~> 4.0, >= 4.2.9)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
-    kramdown (1.16.2)
+    kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -200,16 +199,15 @@ GEM
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
-    minima (2.4.0)
+    minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
-    net-dns (0.8.0)
+    nokogiri (1.8.4)
-    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    octokit (4.8.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
@@ -221,9 +219,9 @@ GEM
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     safe_yaml (1.0.4)
-    sass (3.5.6)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -238,7 +236,7 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -247,4 +245,4 @@ DEPENDENCIES
   github-pages (>= 180)
 
 BUNDLED WITH
-   1.16.1
+   1.16.5

_config.yml

@@ -3,14 +3,16 @@ description: Liquid is a template language and accompanying rendering engine. It
 
 # Build settings
 baseurl:                /liquid # the subpath of your site, e.g. /blog/
-url:                    http://liquidmarkup.org # the base hostname & protocol for your site
+url:                    https://shopify.github.io # the base hostname & protocol for your site
 permalink:              pretty
 exclude:
   - README.md
   - CNAME
   - Gemfile
+  - Gemfile.lock
   - Gruntfile.js
   - package.json
+  - package-lock.json
   - node_modules
 keep_files:             ["css"]
 

basics/index.md

@@ -1,3 +0,0 @@
----
-redirect_to: /basics/introduction
----

basics/introduction.md

@@ -1,6 +1,7 @@
 ---
 title: Introduction
 description: An overview of objects, tags, and filters in the Liquid template language.
+redirect_from: /basics/
 ---
 
 Liquid code can be categorized into [**objects**](#objects), [**tags**](#tags), and [**filters**](#filters).

filters/abs.md

@@ -1,6 +1,7 @@
 ---
 title: abs
 description: Liquid filter that gets the absolute value of a number.
+redirect_from: /filters/
 ---
 
 Returns the absolute value of a number.

filters/index.md

@@ -1,3 +0,0 @@
----
-redirect_to: /filters/abs
----

filters/prepend.md

@@ -22,7 +22,7 @@ You can also `prepend` variables:
 <p class="code-label">Input</p>
 ```liquid
 {% raw %}
-{% assign url = "liquidmarkup.com" %}
+{% assign url = "example.com" %}
 
 {{ "/index.html" | prepend: url }}
 {% endraw %}
@@ -30,7 +30,7 @@ You can also `prepend` variables:
 
 <p class="code-label">Output</p>
 ```text
-{% assign url = "liquidmarkup.com" %}
+{% assign url = "example.com" %}
 
 {{ "/index.html" | prepend: url }}
 ```

package.json

@@ -3,11 +3,11 @@
   "version": "0.2.0",
   "devDependencies": {
     "autoprefixer": "~8.2",
-    "grunt": "~1.0",
+    "grunt": "~1.0.3",
     "grunt-concurrent": "~2.3",
     "grunt-contrib-concat": "~1.0",
     "grunt-contrib-sass": "~1.0",
-    "grunt-contrib-watch": "~1.0",
+    "grunt-contrib-watch": "~1.1.0",
     "grunt-postcss": "~0.9",
     "grunt-shell": "~2.1",
     "load-grunt-tasks": "~3.5"

tags/control-flow.md

@@ -1,6 +1,7 @@
 ---
 title: Control flow
 description: An overview of control flow and conditional tags in the Liquid template language.
+redirect_from: /tags/
 ---
 
 Control flow tags can change the information Liquid shows using programming logic.

tags/index.md

@@ -1,3 +0,0 @@
----
-redirect_to: /tags/control-flow
----