Merge #12

12: seccond attempt at changelogs r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

Author: bors[bot]

Gemfile

@@ -7,5 +7,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gem "jekyll", "~> 3.8"
 
 group :jekyll_plugins do
-
+    gem "jekyll-redirect-from"
 end

Gemfile.lock

@@ -27,6 +27,8 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
+    jekyll-redirect-from (0.15.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-watch (2.2.1)
@@ -56,6 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll (~> 3.8)
+  jekyll-redirect-from
 
 BUNDLED WITH
    1.17.2

_config.yaml

@@ -6,3 +6,5 @@ github_username: rust-analyzer
 exclude:
   - wasm-demo/
   - vendor
+plugins:
+  - jekyll-redirect-from

_layouts/default.html

@@ -20,6 +20,8 @@
   {% if page.url != "/" %}
   <header>
     <a class="nav-link site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+    <a class="nav-link" href="/blog">Blog</a>
+    <a class="nav-link" href="/thisweek">Changelog</a>
     <a class="nav-link" href="https://opencollective.com/rust-analyzer/">Sponsor</a>
   </header>
   {% endif %}

blog.html

@@ -0,0 +1,15 @@
+---
+layout: default
+---
+<h2>Posts</h2>
+
+<ul class="post-list">
+    {% for post in site.categories.blog %}
+    <li>
+        <h3>
+            <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span> <a class="post-link"
+                href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+        </h3>
+    </li>
+    {% endfor %}
+</ul>

_posts/2019-10-16-finance.md renamed to blog/_posts/2019-10-16-finance.md

@@ -2,6 +2,7 @@
 layout: post
 title:  "Cost of rust-analyzer"
 date:   2019-10-16 11:00:00 +0200
+redirect_from: "/2019/10/16/finance.html"
 ---
 
 In this post, we'll talk about financial side of the rust-analyzer project.

_posts/2019-11-13-find-usages.md renamed to blog/_posts/2019-11-13-find-usages.md

@@ -2,6 +2,7 @@
 layout: post
 title:  "Find Usages"
 date:   2019-11-13 11:00:00 +0200
+redirect_from: "/2019/11/13/find-usages.html"
 ---
 
 Last month, rust-analyzer gained an exciting new feature: find usages. It was implemented by [@viorina] in [#1892].

css/main.css

@@ -122,7 +122,6 @@ footer > p {
 .post-list {
     margin-left: 0;
     list-style: none;
-    align-self: center;
 }
 
 .post-list > li {

index.html

@@ -62,13 +62,38 @@ <h2>Support</h2>
     <h2>Latest News</h2>
 
     <ul class="post-list">
-        {% for post in site.posts %}
+        {% assign post = site.categories.thisweek.first %}
         <li>
             <h3>
-                <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span> <a class="post-link"
-                    href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+                <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
+                <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+            </h3>
+        </li>
+
+        <li>
+            <h3>
+                <a class="post-link" href="/thisweek">All</a>
+            </h3>
+        </li>
+    </ul>
+</section>
+
+<section>
+    <h2>Latest Post</h2>
+
+    <ul class="post-list">
+        {% assign post = site.categories.blog.first %}
+        <li>
+            <h3>
+                <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
+                <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+            </h3>
+        </li>
+
+        <li>
+            <h3>
+                <a class="post-link" href="/blog">All</a>
             </h3>
         </li>
-        {% endfor %}
     </ul>
 </section>

thisweek.html

@@ -0,0 +1,15 @@
+---
+layout: default
+---
+<h2>This Week In rust-analyzer</h2>
+
+<ul class="post-list">
+    {% for post in site.categories.thisweek %}
+    <li>
+        <h3>
+            <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span> <a class="post-link"
+                href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+        </h3>
+    </li>
+    {% endfor %}
+</ul>

_posts/2019-07-24-changelog-0.md renamed to thisweek/_posts/2019-07-24-changelog-0.md

@@ -2,6 +2,7 @@
 layout: post
 title:  "Changelog #0"
 date:   2019-07-24 14:34:00 +0200
+redirect_from: "/2019/07/24/changelog-0.html"
 ---
 
 Hello!