Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
ab0b3e6
Update issue template to direct users to changelog instead of git com…
lord Jul 5, 2018
1d6404a
[Security] Bump nokogiri from 1.8.2 to 1.8.5 (#1026)
greysteil Nov 7, 2018
99cdc40
Update link in .editorconfig to https (#1049)
coliff Feb 3, 2019
c8b7355
Fix lowercase "c" in "WooCommerce". (#1043)
jeffstieler Feb 3, 2019
16d2b1e
[Security] Bump ffi from 1.9.17 to 1.9.25 (#1017)
greysteil Jun 1, 2019
3dfde2c
[Security] Bump rack from 2.0.5 to 2.0.6 (#1038)
greysteil Jun 1, 2019
98951d5
Bundle update; upgrade middleman, add sass gem
lord Jun 1, 2019
0b195a9
Update to bundler 2.0 in travis.yml
lord Jun 1, 2019
f81909e
Update issue templates
dan-os May 16, 2019
36b7e44
updated config.rb to activate asset_hash (#1076)
thenengah Jun 1, 2019
e7eb647
change example link correctly (#1130)
danielkorbit Sep 7, 2019
151c303
Change default value of base fork in PR template (#1137)
Oct 14, 2019
894534b
Updated README.md from lord/slate to slatedocs/slate (#1140)
gawry Oct 14, 2019
b3a4f1f
Update url for travis badge
MasterOdin Oct 14, 2019
bc5b66f
[Security] Upgrade nokogiri to 1.10.4 (#1150)
MasterOdin Oct 19, 2019
2019c63
Cut version 2.4.0
MasterOdin Oct 19, 2019
c51fa22
Use the full Apache License 2.0 text in LICENSE
BigBlueHat Jan 10, 2020
274949c
Update GitHub Links on example generated site (#1196)
amayer5125 Feb 4, 2020
7c35df8
Merge branch 'master' into patch-2
MikeRalphson Mar 31, 2020
e3d77f1
Merge pull request #1186 from BigBlueHat/patch-2
MikeRalphson Mar 31, 2020
1be12d2
Update Vagrantfile to Ubuntu 18.04 (#1158)
bradthurber Oct 31, 2019
73e45c5
Ignore generated log file from running Vagrant
MasterOdin Oct 31, 2019
391f3d8
Update tested versions of ruby on Travis (#1160)
MasterOdin Oct 31, 2019
252a48b
Fully parse arguments first in deploy (#1153)
MasterOdin Nov 5, 2019
a4854b0
List maintainers in README (#1164)
lord Dec 3, 2019
375af3c
Install nodejs in Vagrantfile (#1202)
fernandoaguilar Feb 19, 2020
d11eb1f
add Dockerfile (#1124)
redhatxl Apr 2, 2020
7cecafe
add instructions to running docker to README
MasterOdin Apr 2, 2020
a8eb386
Remove line in README about Docker wiki
MasterOdin Apr 3, 2020
f31c738
update middleman dep to 4.3.6
MasterOdin Apr 3, 2020
88b28d4
update middleman-syntax and rouge to ~>3.2
MasterOdin Apr 3, 2020
5b25b04
update nokogiri to ~> 1.10.8
MasterOdin May 8, 2020
4f5b12f
add 2.5.0 release to changelog
MasterOdin May 9, 2020
33c4acc
update screenshot in README with new rouge styling (#1228)
MasterOdin May 12, 2020
aace071
fix bc style breaks from rouge 3.x (#1226)
MasterOdin May 12, 2020
589df5f
Change instructions to use templates instead of forking (#1234)
lord May 16, 2020
8c329dc
disable asset hash for woff and woff2 files out of the box (#1231)
MasterOdin May 18, 2020
8bea123
switch to using debian for docker base for bash (#1233)
MasterOdin May 18, 2020
3582930
update sassc to 2.3.0 in Gemfile.lock
MasterOdin May 19, 2020
f0e8682
v2.6.0 release
MasterOdin May 19, 2020
c7c9eaa
Update bug report templates, remove links to Spectrum (#1239)
lord May 21, 2020
ce2c034
Replace travis with github actions (#1240)
MasterOdin May 23, 2020
215e6ee
add missing middleman build step to deploy gh workflow
MasterOdin May 23, 2020
887f6bb
Replace README Getting Started with links to wiki (#1246)
MasterOdin May 28, 2020
fb25af5
Bump middleman from 4.3.6 to 4.3.7 (#1247)
dependabot-preview[bot] May 28, 2020
595b532
cut v2.6.1 release (#1249)
MasterOdin May 30, 2020
4df1048
Fix broken "Getting Started" link in README (#1251)
ritesh99rakesh Jun 1, 2020
fc7612c
Fix link to wiki in README (#1253)
Jun 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build/
.github/
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

# Top-most EditorConfig file
root = true
Expand Down
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Report a Bug
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Bug Description**
A clear and concise description of what the bug is and how to reproduce it.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Browser (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Last upstream Slate commit (run `git log --author="Robert Lord" | head -n 1`):**
Put the commit hash here
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Questions, Ideas, Discussions
url: https://github.com/slatedocs/slate/discussions
about: Ask and answer questions, and propose new features.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
⚠️ 🚨 ⚠️ STOP AND READ THIS ⚠️ 🚨 ⚠️

👆👆 see that 'base fork' dropdown above? You should change it! The default value of "lord/slate" submits your change to ALL USERS OF SLATE, not just your company. This is PROBABLY NOT WHAT YOU WANT.
👆👆 see that 'base fork' dropdown above? You should change it! The default value of "slatedocs/slate" submits your change to ALL USERS OF SLATE, not just your company. This is PROBABLY NOT WHAT YOU WANT.
-->
36 changes: 36 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Build

on:
push:
branches: [ '*' ]
pull_request:
branches: [ '*' ]

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]

steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}

- uses: actions/cache@v1
with:
path: vendor/bundle
key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}

# necessary to get ruby 2.3 to work nicely with bundler vendor/bundle cache
# can remove once ruby 2.3 is no longer supported
- run: gem update --system

- run: bundle config set deployment 'true'
- run: bundle install

- run: bundle exec middleman build
34 changes: 34 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Deploy

on:
push:
branches: [ 'master' ]

jobs:
deploy:
runs-on: ubuntu-latest
env:
ruby-version: 2.5

steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby-version }}

- uses: actions/cache@v1
with:
path: vendor/bundle
key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }}

- run: bundle config set deployment 'true'
- run: bundle install

- run: bundle exec middleman build

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ build/
_yardoc
doc/
.idea/

# Vagrant artifacts
ubuntu-*-console.log
10 changes: 0 additions & 10 deletions .travis.yml

This file was deleted.

52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,57 @@
# Changelog

## Version 2.6.1

*May 30, 2020*

* __[security]__ update child dependency activesupport in Gemfile.lock to 5.4.2.3
* Update Middleman in Gemfile.lock to 4.3.7
* Replace Travis-CI with GitHub actions for continuous integration
* Replace Spectrum with GitHub discussions

## Version 2.6.0

*May 18, 2020*

__Note__: 2.5.0 was "pulled" due to a breaking bug discovered after release. It is recommended to skip it, and move straight to 2.6.0.

* Fix large whitespace gap in middle column for sections with codeblocks
* Fix highlighted code elements having a different background than rest of code block
* Change JSON keys to have a different font color than their values
* Disable asset hashing for woff and woff2 elements due to middleman bug breaking woff2 asset hashing in general
* Move Dockerfile to Debian from Alpine
* Converted repo to a [GitHub template](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-template-repository)
* Update sassc to 2.3.0 in Gemfile.lock

## Version 2.5.0

*May 8, 2020*

* __[security]__ update nokogiri to ~> 1.10.8
* Update links in example docs to https://github.com/slatedocs/slate from https://github.com/lord/slate
* Update LICENSE to include full Apache 2.0 text
* Test slate against Ruby 2.5 and 2.6 on Travis-CI
* Update Vagrantfile to use Ubuntu 18.04 (thanks @bradthurber)
* Parse arguments and flags for deploy.sh on script start, instead of potentially after building source files
* Install nodejs inside Vagrantfile (thanks @fernandoaguilar)
* Add Dockerfile for running slate (thanks @redhatxl)
* update middleman-syntax and rouge to ~>3.2
* update middleman to 4.3.6

## Version 2.4.0

*October 19, 2019*

- Move repository from lord/slate to slatedocs/slate
- Fix documentation to point at new repo link, thanks to [Arun](https://github.com/slash-arun), [Gustavo Gawryszewski](https://github.com/gawry), and [Daniel Korbit](https://github.com/danielkorbit)
- Update `nokogiri` to 1.10.4
- Update `ffi` in `Gemfile.lock` to fix security warnings, thanks to [Grey Baker](https://github.com/greysteil) and [jackmack](https://github.com/jakemack)
- Update `rack` to 2.0.7 in `Gemfile.lock` to fix security warnings, thanks to [Grey Baker](https://github.com/greysteil) and [jackmack](https://github.com/jakemack)
- Update middleman to `4.3` and relax constraints on middleman related gems, thanks to [jackmack](https://github.com/jakemack)
- Add sass gem, thanks to [jackmack](https://github.com/jackmack)
- Activate `asset_cache` in middleman to improve cacheability of static files, thanks to [Sam Gilman](https://github.com/thenengah)
- Update to using bundler 2 for `Gemfile.lock`, thanks to [jackmack](https://github.com/jakemack)

## Version 2.3.1

*July 5, 2018*
Expand Down
20 changes: 20 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM ruby:2.6-slim

WORKDIR /srv/slate

VOLUME /srv/slate/source
EXPOSE 4567

COPY . /srv/slate

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
build-essential \
nodejs \
&& gem install bundler \
&& bundle install \
&& apt-get remove -y build-essential \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*

CMD ["bundle", "exec", "middleman", "server", "--watcher-force-polling"]
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ ruby '>=2.3.1'
source 'https://rubygems.org'

# Middleman
gem 'middleman', '~>4.2.1'
gem 'middleman-syntax', '~> 3.0.0'
gem 'middleman-autoprefixer', '~> 2.7.0'
gem 'middleman-sprockets', '~> 4.1.0'
gem 'rouge', '~> 2.0.5'
gem 'middleman', '~>4.3'
gem 'middleman-syntax', '~> 3.2'
gem 'middleman-autoprefixer', '~> 2.7'
gem 'middleman-sprockets', '~> 4.1'
gem 'rouge', '~> 3.2'
gem 'redcarpet', '~> 3.4.0'
gem 'nokogiri', '~> 1.8.2'
gem 'nokogiri', '~> 1.10.8'
gem 'sass'
Loading