From 697713b3c78d1d331c62bee8e91c7ee295292367 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Fri, 16 Feb 2018 16:10:19 +0100 Subject: [PATCH 01/11] add a docker-compose.yaml --- Gemfile | 4 ++-- docker-compose.yaml | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 docker-compose.yaml diff --git a/Gemfile b/Gemfile index f6c8bdc6b..774375508 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.3.1' -gem 'jekyll', '3.5.2' + +gem 'jekyll' gem 'kramdown' gem 'rack-jekyll' gem 'rake' diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 000000000..1f5b7626e --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,13 @@ +version: "2" +services: + scala-lang: + command: jekyll serve --incremental + image: jekyll/jekyll:latest + volumes: + - $PWD:/srv/jekyll + - $PWD/vendor/bundle:/usr/local/bundle + ports: + - 4000:4000 + - 35729:35729 + - 3000:3000 + - 80:4000 \ No newline at end of file From 0ad7d0561571fb73368ed19d4b8401d691087d83 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Fri, 16 Feb 2018 16:17:24 +0100 Subject: [PATCH 02/11] update gems --- Gemfile.lock | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 543613a05..79fddddc7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.1.4) + activesupport (5.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -11,9 +11,13 @@ GEM colorator (1.1.0) colorize (0.8.1) concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) ethon (0.11.0) ffi (>= 1.3.0) - ffi (1.9.18) + eventmachine (1.2.5) + ffi (1.9.21) forwardable-extended (2.6.0) html-proofer (3.8.0) activesupport (>= 4.2, < 6.0) @@ -24,51 +28,56 @@ GEM parallel (~> 1.3) typhoeus (~> 1.3) yell (~> 2.0) - i18n (0.9.3) + http_parser.rb (0.6.0) + i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.5.2) + jekyll (3.7.2) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-redirect-from (0.12.1) + jekyll-redirect-from (0.13.0) jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.14.0) + jekyll-watch (2.0.0) + listen (~> 3.0) + kramdown (1.16.2) liquid (4.0.0) - listen (3.0.8) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - minitest (5.11.2) - nokogiri (1.8.1) + minitest (5.11.3) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) parallel (1.12.1) - pathutil (0.14.0) + pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (3.0.0) - rack (1.6.5) + public_suffix (3.0.2) + rack (1.6.8) rack-jekyll (0.5.0) jekyll (>= 1.3) listen (>= 1.3) rack (~> 1.5) - rake (12.0.0) + rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (1.11.1) + rouge (3.1.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.1) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -76,7 +85,7 @@ GEM thread_safe (0.3.6) typhoeus (1.3.0) ethon (>= 0.9.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) yell (2.0.7) @@ -85,14 +94,11 @@ PLATFORMS DEPENDENCIES html-proofer - jekyll (= 3.5.2) + jekyll jekyll-redirect-from kramdown rack-jekyll rake -RUBY VERSION - ruby 2.3.3p222 - BUNDLED WITH - 1.16.0 + 1.16.1 From 825097fdfabb3acb8c045f7323dcc89ddb446984 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Fri, 16 Feb 2018 18:47:37 +0100 Subject: [PATCH 03/11] add scripts to build, run, serve, etc. the site. --- bin/bundle | 2 ++ bin/check-internal-links | 2 ++ bin/check-links | 2 ++ bin/jekyll | 2 ++ bin/serve | 2 ++ 5 files changed, 10 insertions(+) create mode 100755 bin/bundle create mode 100755 bin/check-internal-links create mode 100755 bin/check-links create mode 100755 bin/jekyll create mode 100755 bin/serve diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..c3889a67b --- /dev/null +++ b/bin/bundle @@ -0,0 +1,2 @@ +#!/bin/bash +docker-compose run --service-ports scala-lang bundle $@ diff --git a/bin/check-internal-links b/bin/check-internal-links new file mode 100755 index 000000000..9cf6d75cf --- /dev/null +++ b/bin/check-internal-links @@ -0,0 +1,2 @@ +#!/bin/bash +docker-compose run --service-ports scala-lang bundle exec htmlproofer ./_site/ --only-4xx --empty-alt-ignore --allow-hash-href --disable-external diff --git a/bin/check-links b/bin/check-links new file mode 100755 index 000000000..f08c44a51 --- /dev/null +++ b/bin/check-links @@ -0,0 +1,2 @@ +#!/bin/bash +docker-compose run --service-ports scala-lang bundle exec htmlproofer ./_site/ --only-4xx --empty-alt-ignore --allow-hash-href diff --git a/bin/jekyll b/bin/jekyll new file mode 100755 index 000000000..7aa311e42 --- /dev/null +++ b/bin/jekyll @@ -0,0 +1,2 @@ +#!/bin/bash +docker-compose run --service-ports scala-lang jekyll $@ diff --git a/bin/serve b/bin/serve new file mode 100755 index 000000000..15de0f997 --- /dev/null +++ b/bin/serve @@ -0,0 +1,2 @@ +#!/bin/bash +docker-compose run --service-ports scala-lang jekyll serve --incremental From 01eeee258e3ea167c627d68a8cb426f5b0dc9158 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Sat, 17 Feb 2018 09:32:36 +0100 Subject: [PATCH 04/11] remove default command from docker compose --- docker-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1f5b7626e..516153962 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,6 @@ version: "2" services: scala-lang: - command: jekyll serve --incremental image: jekyll/jekyll:latest volumes: - $PWD:/srv/jekyll From 619b64fdf8af6093bf7305934db520fb6b6136e4 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Sat, 17 Feb 2018 09:37:57 +0100 Subject: [PATCH 05/11] forcing vendor and vendor/bundle to exist This makes it so docker does not create these directories with root --- vendor/bundle/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 vendor/bundle/.gitkeep diff --git a/vendor/bundle/.gitkeep b/vendor/bundle/.gitkeep new file mode 100644 index 000000000..e69de29bb From bc715d8cf278d523fe54cf607a728857d9fad38b Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Thu, 22 Feb 2018 10:05:08 +0100 Subject: [PATCH 06/11] first pass over README --- README.md | 135 +++++++++++++----------------------------------------- 1 file changed, 32 insertions(+), 103 deletions(-) diff --git a/README.md b/README.md index aeec1c445..7088f0bc8 100644 --- a/README.md +++ b/README.md @@ -1,87 +1,37 @@ # scala-lang.org -This repository contains the _static_ source of [scala-lang.org](http://scala-lang.org). +This repository contains the source for [scala-lang.org](http://scala-lang.org). -It does not contain the source of any content found under the [docs.scala-lang.org](http://docs.scala-lang.org) subdomain (instead, visit the [docs.scala-lang repo](http://github.com/scala/docs.scala-lang) for that source). - -This is a static site generated by [Jekyll](https://github.com/mojombo/jekyll), and uses a whole host of open-source tools including a touch of Twitter's Bootstrap. +It does not contain the source for the [docs.scala-lang.org](http://docs.scala-lang.org) subdomain. You can visit the [docs.scala-lang repo](https://github.com/scala/docs.scala-lang) if you are interested in contributing to the Scala documentation site. ## Dependencies -This site uses a Jekyll, a Ruby framework. The required Jekyll version is 3.4.0. - -## Building the site - -There are two ways to run Jekyll to build the site: - -1. Using [Bundler], so Jekyll and accompanying gems are installed only inside this directory. -2. Using globally-installed Jekyll and accompanying gems. - -The latter method is the one currently actually used on scala-lang.org. The -former method is likely most convenient for users who already have a different -version of Jekyll installed, or who are comfortable using Bundler and who don't -want anything else installed system-wide. - -### Option 1) Building with Bundler - -`cd` into the directory where you cloned this repository, then install the -required gems with `bundle install`. This will automatically put the gems into -`./bundle-vendor/bundle`. - -Start the server in the context of the bundle: - - bundle exec jekyll serve - -That's it. - -If that doesn't work, to guarantee that your version of Ruby, etc, completely -matches the production environment, you can also use `rbenv`. Start by `cd`ing -into the directory where you cloned this repository, then execute the following: - - rbenv install 2.3.1 - rbenv local 2.3.1 - rbenv rehash - gem install bundle - bundle install # This will automatically put the gems into `./bundle-vendor/bundle` - bundle exec jekyll serve # Start the server in the context of the bundle - -From this point, everything else should be the same, regardless of which method -you used to run Jekyll. - -### Option 2) Building with global Jekyll - -Install Jekyll 3.4.0 on your system using RubyGems: - - gem install jekyll -v 3.4.0 - -After cloning, `cd`ing into the directory where you cloned this repository and -run: +To build the site you can either use [Compose](https://github.com/docker/compose) or [Bundler](https://github.com/bundler/bundler). Compose is a good option if you are just getting +started and want something simple. If you are already familiar with the Ruby ecosystem then Bundler +might be the most comfortable for you. - jekyll serve +Either way the site is built with [Jekyll](https://github.com/jekyll/jekyll) and is typeset mostly in +Markdown. -and watch the output. You should see something like: - - Configuration file: /Users/ben/src/scala-lang/_config.yml - Source: /Users/ben/src/scala-lang - Destination: /Users/ben/src/scala-lang/_site - Incremental build: enabled - Generating... done. - Auto-regeneration: enabled for '/Users/ben/src/scala-lang' - -### Windows and UTF-8 +## Building the site +Make sure you are in the root directory of the cloned repository. +### For Compose: +``` +bin/serve +``` -If you get `incompatible encoding` errors when generating the site under Windows, then ensure that the -console in which you are running jekyll can work with UTF-8 characters. As described in the blog -[Solving UTF problem with Jekyll on Windows](http://joseoncode.com/2011/11/27/solving-utf-problem-with-jekyll-on-windows/) -you have to execute `chcp 65001`. This command is best added to the `jekyll.bat`-script. +### For Bundler: +``` +bundle exec jekyll serve --incremental +``` ## Viewing the site Regardless of your method of running Jekyll, the generated site is available at `http://localhost:4000`. -If you add `--watch` to your Jekyll command line, Jekyll will automatically watch for changes on the filesystem. When you change a file, the console will show that jekyll is regenerating. Wait until it says `done` to refresh your browser. +## Editing the Site -## YAML Front Matter +### YAML Front Matter The "YAML Front Matter" is nothing more than the header on each page that you intend for Jekyll to parse. It contains information such as the name of the HTML template (layout) chosen for the specific document, and the title of the document. An example YAML front matter might look like: @@ -103,31 +53,29 @@ You can use these fields in the YAML front matter later in your document. For ex `# {{ page.title }}` would be rendered in HTML as, `

My page title

`. -## Markdown +### Recomended Markdown Editor -There are dozens of guides and cheatsheets that cover Markdown syntax out there, though this screenshot from the free OS X Markdown editor, [Mou](http://mouapp.com/), is an excellent and concise reference: - -![Mou screen shot](http://25.io/mou/img/1.png) +[Visual Studio Code](https://github.com/Microsoft/vscode) has great support for Scala, Git, and Markdown. ### Linking to internal pages -The least error-prone way to link between documents, to link to local images, or anything else: `[link text]({{ site.baseurl }}/path/to/page/page.html)` +The least error-prone way to make links is to use this format: `[link text]({{ site.baseurl }}/path/to/page/page.html)` -Here, `{{ site.baseurl }}` is a site-wide variable that represents the root directory of the static site. So, to display the Scala logo image, located in `img/scala-logo.png`, one must simply write: `![Img alt text]({{ site.baseurl }}/resources/img/scala-logo.png)` +`{{ site.baseurl }}` is a site-wide variable that represents the root directory of the static site. So, to display the Scala logo image you can simply write: `![Img alt text]({{ site.baseurl }}/resources/img/scala-logo.png)` -## Permalinks +### Permalinks -In this new version of the scala-lang site we've tried to follow a `pretty permalink` style, so that any generated page will have an permalink finishing in a slash character (`/`). This will tell Jekyll to build that particular page as an `index.html` inside a folder with a name as specified in the provided permalink. i.e.: if a page has a permalink as follows: +We trie to follow a [pretty permalink](https://jekyllrb.com/docs/permalinks/) style, so that any generated page will have a link finishing in a slash character (`/`). This will tell Jekyll to build that particular page as an `index.html` inside a folder with a name as specified in the provided permalink. i.e.: if a page has a permalink as follows: `permalink: /what-is-scala/` -This will tell Jekyll to create a `what-is-scala` folder, with an `index.html` file inside. Links to this page will refer to the `{{site.baseurl}}/what-is-scala/`. +This will tell Jekyll to create a `what-is-scala` directory, with an `index.html` file inside. Links to this page will refer to the `{{site.baseurl}}/what-is-scala/`. -## Custom collections and data +### Custom collections and data -In the previous version of the site, data used in different pages was contained in categorized blogs. This has been changed to use custom collections. Every custom collection is a folder starting with an underscore character (`_`), containing a `markdown` file for each member of the collection. As any markdown containing a page in the site, it starts with a YAML front matter containing the data for this item, and can optionally contain markdown text to be rendered as html. +Every [collection](https://jekyllrb.com/docs/collections/) is a directory starting with an underscore character (`_`), containing a Markdown file for each member of the collection. These Markdown files start with a YAML front matter containing the data for this item, and can optionally contain markdown text to be rendered as html. -Right now there are no collections being rendered as specific pages in the site (they're only consumed internally as static data), but in the future this can be changed by specifying the global `output: true` variable in the `_config.yml` custom collections section. You'll also need to specify a layout by using the `defaults` settings in the `_config.yml` file. i.e.: +Right now there are no collections being rendered as specific pages in the site. They are only consumed internally as data. In the future this can be changed by specifying the global `output: true` variable in the `_config.yml` custom collections section. You will also need to specify a layout by using the `defaults` settings in the `_config.yml` file. i.e.: ``` defaults: @@ -138,13 +86,11 @@ defaults: layout: layout_name ``` -To access data from a custom collection just refer to `site.`. The collection's name will be the name of its folder sans the underscore character. i.e.: to access the data inside `_downloads`, you can do it as follows: - -`site.downloads` +To access data from a custom collection refer to `site.`. The collection's name will be the name of it's directory without the underscore character. i.e.: to access the data inside `_downloads`, use `site.downloads`. -Some of the data has been also modelled as YAML files inside the `_data` folder. Generally for data that is used throughout the site (i.e: the navigation bar links). +Some of our data has been modelled as YAML files inside the `_data` folder. We generally do this for data that is used throughout the whole site. For example we do this for the navigation bar links. -## Resources and Workflow +## The Backend On every commit to the `scala/scala-lang` repository a [jenkins job](https://scala-webapps.epfl.ch/jenkins/view/All/job/production_scala-lang.org-builder/) will generate the site using jekyll and copy the resulting files to the webserver. **NOTE**: the `rsync` of this job also deletes whatever is in the webserver directory **with explicit exceptions**: we need to keep the files listed below. Kind of a hack. @@ -158,20 +104,3 @@ There are additional files on the webserver: - nightly builds in `/nightly/distributions/` - nightly api builds in `/nightly/docs-xxx/` - nightly pdf builds (spec etc) in `/nightly/pdfs` - -## Templates - -We have the following (general) templates: -_(Note that this is not an exhaustive list.)_ - -#### page.html - -Example YAML front matter with all possible fields: - - --- - layout: page - title: I Haz Build: An Autobiography of the Build Kitten - by: Scala Jenkins (Build Kitty) - --- - -[Bundler]: http://bundler.io/ From 1947c72969c29f95c59d0c3c849a2541b7d4a5b4 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Thu, 22 Feb 2018 10:11:38 +0100 Subject: [PATCH 07/11] add check for docker compose to bash scripts --- bin/bundle | 1 + bin/check-internal-links | 1 + bin/check-links | 1 + bin/jekyll | 1 + bin/serve | 1 + 5 files changed, 5 insertions(+) diff --git a/bin/bundle b/bin/bundle index c3889a67b..d14fe699a 100755 --- a/bin/bundle +++ b/bin/bundle @@ -1,2 +1,3 @@ #!/bin/bash +command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; } docker-compose run --service-ports scala-lang bundle $@ diff --git a/bin/check-internal-links b/bin/check-internal-links index 9cf6d75cf..a64102f6f 100755 --- a/bin/check-internal-links +++ b/bin/check-internal-links @@ -1,2 +1,3 @@ #!/bin/bash +command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; } docker-compose run --service-ports scala-lang bundle exec htmlproofer ./_site/ --only-4xx --empty-alt-ignore --allow-hash-href --disable-external diff --git a/bin/check-links b/bin/check-links index f08c44a51..c3b7fe997 100755 --- a/bin/check-links +++ b/bin/check-links @@ -1,2 +1,3 @@ #!/bin/bash +command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; } docker-compose run --service-ports scala-lang bundle exec htmlproofer ./_site/ --only-4xx --empty-alt-ignore --allow-hash-href diff --git a/bin/jekyll b/bin/jekyll index 7aa311e42..16eb22f24 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -1,2 +1,3 @@ #!/bin/bash +command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; } docker-compose run --service-ports scala-lang jekyll $@ diff --git a/bin/serve b/bin/serve index 15de0f997..9e05fa696 100755 --- a/bin/serve +++ b/bin/serve @@ -1,2 +1,3 @@ #!/bin/bash +command -v docker-compose >/dev/null 2>&1 || { echo >&2 "Please install Docker Compose: https://docs.docker.com/compose/install/"; exit 1; } docker-compose run --service-ports scala-lang jekyll serve --incremental From 99d64f715d21950ddad8c8d4f41114bb279efa57 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Thu, 22 Feb 2018 10:33:35 +0100 Subject: [PATCH 08/11] spelling in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7088f0bc8..398dcc151 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repository contains the source for [scala-lang.org](http://scala-lang.org). -It does not contain the source for the [docs.scala-lang.org](http://docs.scala-lang.org) subdomain. You can visit the [docs.scala-lang repo](https://github.com/scala/docs.scala-lang) if you are interested in contributing to the Scala documentation site. +It does not contain the source for the [docs.scala-lang.org](http://docs.scala-lang.org) subdomain. You can visit the [docs.scala-lang repository](https://github.com/scala/docs.scala-lang) if you are interested in contributing to the Scala documentation site. ## Dependencies @@ -53,7 +53,7 @@ You can use these fields in the YAML front matter later in your document. For ex `# {{ page.title }}` would be rendered in HTML as, `

My page title

`. -### Recomended Markdown Editor +### Recommended Markdown Editor [Visual Studio Code](https://github.com/Microsoft/vscode) has great support for Scala, Git, and Markdown. From d522a9ec57fae9d25a796e94bf1cb4c8392e7b0a Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Thu, 22 Feb 2018 11:52:23 +0100 Subject: [PATCH 09/11] minimize changes to Gemfile.lock --- Gemfile.lock | 53 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 79fddddc7..4a613bde7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.1.5) + activesupport (5.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -11,13 +11,9 @@ GEM colorator (1.1.0) colorize (0.8.1) concurrent-ruby (1.0.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) - ffi (1.9.21) + ffi (1.9.18) forwardable-extended (2.6.0) html-proofer (3.8.0) activesupport (>= 4.2, < 6.0) @@ -28,56 +24,51 @@ GEM parallel (~> 1.3) typhoeus (~> 1.3) yell (~> 2.0) - http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (0.9.3) concurrent-ruby (~> 1.0) - jekyll (3.7.2) + jekyll (3.5.2) addressable (~> 2.4) colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 2.0) - kramdown (~> 1.14) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-redirect-from (0.13.0) + jekyll-redirect-from (0.12.1) jekyll (~> 3.3) - jekyll-sass-converter (1.5.2) + jekyll-sass-converter (1.5.0) sass (~> 3.4) - jekyll-watch (2.0.0) - listen (~> 3.0) - kramdown (1.16.2) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + kramdown (1.14.0) liquid (4.0.0) - listen (3.1.5) + listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - minitest (5.11.3) - nokogiri (1.8.2) + minitest (5.11.2) + nokogiri (1.8.1) mini_portile2 (~> 2.3.0) parallel (1.12.1) - pathutil (0.16.1) + pathutil (0.14.0) forwardable-extended (~> 2.6) - public_suffix (3.0.2) - rack (1.6.8) + public_suffix (3.0.0) + rack (1.6.5) rack-jekyll (0.5.0) jekyll (>= 1.3) listen (>= 1.3) rack (~> 1.5) - rake (12.3.0) + rake (12.0.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (3.1.1) - ruby_dep (1.5.0) + rouge (1.11.1) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.1) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -85,7 +76,7 @@ GEM thread_safe (0.3.6) typhoeus (1.3.0) ethon (>= 0.9.0) - tzinfo (1.2.5) + tzinfo (1.2.4) thread_safe (~> 0.1) yell (2.0.7) From e857f49ad1d5e326b9d3b11acc64428f885d6a96 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Thu, 22 Feb 2018 11:57:03 +0100 Subject: [PATCH 10/11] fix rendering problem in README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 398dcc151..c65bcfd17 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ The least error-prone way to make links is to use this format: `[link text]({{ s `{{ site.baseurl }}` is a site-wide variable that represents the root directory of the static site. So, to display the Scala logo image you can simply write: `![Img alt text]({{ site.baseurl }}/resources/img/scala-logo.png)` -### Permalinks +### Permalinks We trie to follow a [pretty permalink](https://jekyllrb.com/docs/permalinks/) style, so that any generated page will have a link finishing in a slash character (`/`). This will tell Jekyll to build that particular page as an `index.html` inside a folder with a name as specified in the provided permalink. i.e.: if a page has a permalink as follows: @@ -71,7 +71,7 @@ We trie to follow a [pretty permalink](https://jekyllrb.com/docs/permalinks/) st This will tell Jekyll to create a `what-is-scala` directory, with an `index.html` file inside. Links to this page will refer to the `{{site.baseurl}}/what-is-scala/`. -### Custom collections and data +### Custom collections and data Every [collection](https://jekyllrb.com/docs/collections/) is a directory starting with an underscore character (`_`), containing a Markdown file for each member of the collection. These Markdown files start with a YAML front matter containing the data for this item, and can optionally contain markdown text to be rendered as html. From 9bb3e3d29762aff1ad9c6553f985957e58ae9d22 Mon Sep 17 00:00:00 2001 From: Jarrod Urban Date: Thu, 22 Feb 2018 12:02:06 +0100 Subject: [PATCH 11/11] renamed YAML file for good measure --- docker-compose.yaml => docker-compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yaml => docker-compose.yml (100%) diff --git a/docker-compose.yaml b/docker-compose.yml similarity index 100% rename from docker-compose.yaml rename to docker-compose.yml