From b7e80e6d4652fbe5a3c7d26efe8d91cf63a558a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 08:52:39 -0400 Subject: [PATCH 01/94] Bump rouge from 3.20.0 to 3.21.0 (#1285) Bumps [rouge](https://github.com/rouge-ruby/rouge) from 3.20.0 to 3.21.0. - [Release notes](https://github.com/rouge-ruby/rouge/releases) - [Changelog](https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md) - [Commits](https://github.com/rouge-ruby/rouge/compare/v3.20.0...v3.21.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 315a86d0945..4dc664df2f5 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'middleman', '~>4.3' gem 'middleman-syntax', '~> 3.2' gem 'middleman-autoprefixer', '~> 2.7' gem 'middleman-sprockets', '~> 4.1' -gem 'rouge', '~> 3.20' +gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' gem 'nokogiri', '~> 1.10.8' gem 'sass' diff --git a/Gemfile.lock b/Gemfile.lock index b3db4b0e841..c7957e60e2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) - rouge (3.20.0) + rouge (3.21.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -124,7 +124,7 @@ DEPENDENCIES middleman-syntax (~> 3.2) nokogiri (~> 1.10.8) redcarpet (~> 3.5.0) - rouge (~> 3.20) + rouge (~> 3.21) sass RUBY VERSION From d2e11a393f82f21cbe9ad7595d0dbcf3ba306915 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 31 Jul 2020 08:53:11 -0400 Subject: [PATCH 02/94] Bump nokogiri from 1.10.9 to 1.10.10 (#1282) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.9 to 1.10.10. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.9...v1.10.10) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c7957e60e2d..252d92ac616 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM rouge (~> 3.2) mini_portile2 (2.4.0) minitest (5.14.1) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) padrino-helpers (0.13.3.4) i18n (~> 0.6, >= 0.6.7) From 616df6223adc885cd568f154f8246ca830899c8a Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Mon, 10 Aug 2020 10:26:12 -0400 Subject: [PATCH 03/94] trim ending newline on copied code (#1296) Signed-off-by: Matthew Peveler --- source/javascripts/app/_copy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/javascripts/app/_copy.js b/source/javascripts/app/_copy.js index f1e3a432566..4dfbbb6c06d 100644 --- a/source/javascripts/app/_copy.js +++ b/source/javascripts/app/_copy.js @@ -1,6 +1,6 @@ function copyToClipboard(container) { const el = document.createElement('textarea'); - el.value = container.textContent; + el.value = container.textContent.replace(/\n$/, ''); document.body.appendChild(el); el.select(); document.execCommand('copy'); From 985a75aa3c05960f11fb0554a117b8d3a132b72b Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Mon, 10 Aug 2020 10:42:37 -0400 Subject: [PATCH 04/94] Rework docker image to be easier to use for development and deployment (#1297) Signed-off-by: Matthew Peveler --- Dockerfile | 8 +- slate.sh | 248 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 254 insertions(+), 2 deletions(-) create mode 100755 slate.sh diff --git a/Dockerfile b/Dockerfile index 33b80ca4216..c74158d5bf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,9 @@ FROM ruby:2.6-slim WORKDIR /srv/slate +VOLUME /srv/slate/build VOLUME /srv/slate/source + EXPOSE 4567 COPY . /srv/slate @@ -15,6 +17,8 @@ RUN apt-get update \ && bundle install \ && apt-get remove -y build-essential \ && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && chmod +x /srv/slate/slate.sh -CMD ["bundle", "exec", "middleman", "server", "--watcher-force-polling"] +ENTRYPOINT ["/srv/slate/slate.sh"] +CMD ["build"] diff --git a/slate.sh b/slate.sh new file mode 100755 index 00000000000..a3cc498e99a --- /dev/null +++ b/slate.sh @@ -0,0 +1,248 @@ +#!/usr/bin/env bash +set -o errexit #abort if any command fails + +me=$(basename "$0") + +help_message="\ +Usage: $me [] [] +Run commands related to the slate process. + +Commands: + + serve Run the middleman server process, useful for + development. + build Run the build process. + deploy Will build and deploy files to branch. Use + --no-build to only deploy. + +Global Options: + + -h, --help Show this help information. + -v, --verbose Increase verbosity. Useful for debugging. + +Deploy options: + -e, --allow-empty Allow deployment of an empty directory. + -m, --message MESSAGE Specify the message used when committing on the + deploy branch. + -n, --no-hash Don't append the source commit's hash to the deploy + commit's message. + --no-build Do not build the source files. +" + + +run_serve() { + exec bundle exec middleman serve --watcher-force-polling +} + +run_build() { + bundle exec middleman build --clean +} + +parse_args() { + # Set args from a local environment file. + if [ -e ".env" ]; then + source .env + fi + + command= + + # Parse arg flags + # If something is exposed as an environment variable, set/overwrite it + # here. Otherwise, set/overwrite the internal variable instead. + while : ; do + if [[ $1 = "-h" || $1 = "--help" ]]; then + echo "$help_message" + exit 0 + elif [[ $1 = "-v" || $1 = "--verbose" ]]; then + verbose=true + shift + elif [[ $1 = "-e" || $1 = "--allow-empty" ]]; then + allow_empty=true + shift + elif [[ ( $1 = "-m" || $1 = "--message" ) && -n $2 ]]; then + commit_message=$2 + shift 2 + elif [[ $1 = "-n" || $1 = "--no-hash" ]]; then + GIT_DEPLOY_APPEND_HASH=false + shift + elif [[ $1 = "--no-build" ]]; then + no_build=true + shift + elif [[ $1 = "serve" || $1 = "build" || $1 = "deploy" ]]; then + if [ ! -z "${command}" ]; then + >&2 echo "You can only specify one command." + exit 1 + fi + command=$1 + shift + elif [ -z $1 ]; then + break + fi + done + + if [ -z "${command}" ]; then + >&2 echo "Command not specified." + exit 1 + fi + + # Set internal option vars from the environment and arg flags. All internal + # vars should be declared here, with sane defaults if applicable. + + # Source directory & target branch. + deploy_directory=build + deploy_branch=gh-pages + + #if no user identity is already set in the current git environment, use this: + default_username=${GIT_DEPLOY_USERNAME:-deploy.sh} + default_email=${GIT_DEPLOY_EMAIL:-} + + #repository to deploy to. must be readable and writable. + repo=origin + + #append commit hash to the end of message by default + append_hash=${GIT_DEPLOY_APPEND_HASH:-true} +} + +main() { + enable_expanded_output + + if ! git diff --exit-code --quiet --cached; then + echo Aborting due to uncommitted changes in the index >&2 + return 1 + fi + + commit_title=`git log -n 1 --format="%s" HEAD` + commit_hash=` git log -n 1 --format="%H" HEAD` + + #default commit message uses last title if a custom one is not supplied + if [[ -z $commit_message ]]; then + commit_message="publish: $commit_title" + fi + + #append hash to commit message unless no hash flag was found + if [ $append_hash = true ]; then + commit_message="$commit_message"$'\n\n'"generated from commit $commit_hash" + fi + + previous_branch=`git rev-parse --abbrev-ref HEAD` + + if [ ! -d "$deploy_directory" ]; then + echo "Deploy directory '$deploy_directory' does not exist. Aborting." >&2 + return 1 + fi + + # must use short form of flag in ls for compatibility with macOS and BSD + if [[ -z `ls -A "$deploy_directory" 2> /dev/null` && -z $allow_empty ]]; then + echo "Deploy directory '$deploy_directory' is empty. Aborting. If you're sure you want to deploy an empty tree, use the --allow-empty / -e flag." >&2 + return 1 + fi + + if git ls-remote --exit-code $repo "refs/heads/$deploy_branch" ; then + # deploy_branch exists in $repo; make sure we have the latest version + + disable_expanded_output + git fetch --force $repo $deploy_branch:$deploy_branch + enable_expanded_output + fi + + # check if deploy_branch exists locally + if git show-ref --verify --quiet "refs/heads/$deploy_branch" + then incremental_deploy + else initial_deploy + fi + + restore_head +} + +initial_deploy() { + git --work-tree "$deploy_directory" checkout --orphan $deploy_branch + git --work-tree "$deploy_directory" add --all + commit+push +} + +incremental_deploy() { + #make deploy_branch the current branch + git symbolic-ref HEAD refs/heads/$deploy_branch + #put the previously committed contents of deploy_branch into the index + git --work-tree "$deploy_directory" reset --mixed --quiet + git --work-tree "$deploy_directory" add --all + + set +o errexit + diff=$(git --work-tree "$deploy_directory" diff --exit-code --quiet HEAD --)$? + set -o errexit + case $diff in + 0) echo No changes to files in $deploy_directory. Skipping commit.;; + 1) commit+push;; + *) + echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to main, use: git symbolic-ref HEAD refs/heads/main && git reset --mixed >&2 + return $diff + ;; + esac +} + +commit+push() { + set_user_id + git --work-tree "$deploy_directory" commit -m "$commit_message" + + disable_expanded_output + #--quiet is important here to avoid outputting the repo URL, which may contain a secret token + git push --quiet $repo $deploy_branch + enable_expanded_output +} + +#echo expanded commands as they are executed (for debugging) +enable_expanded_output() { + if [ $verbose ]; then + set -o xtrace + set +o verbose + fi +} + +#this is used to avoid outputting the repo URL, which may contain a secret token +disable_expanded_output() { + if [ $verbose ]; then + set +o xtrace + set -o verbose + fi +} + +set_user_id() { + if [[ -z `git config user.name` ]]; then + git config user.name "$default_username" + fi + if [[ -z `git config user.email` ]]; then + git config user.email "$default_email" + fi +} + +restore_head() { + if [[ $previous_branch = "HEAD" ]]; then + #we weren't on any branch before, so just set HEAD back to the commit it was on + git update-ref --no-deref HEAD $commit_hash $deploy_branch + else + git symbolic-ref HEAD refs/heads/$previous_branch + fi + + git reset --mixed +} + +filter() { + sed -e "s|$repo|\$repo|g" +} + +sanitize() { + "$@" 2> >(filter 1>&2) | filter +} + +parse_args "$@" + +if [ "${command}" = "serve" ]; then + run_serve +elif [[ "${command}" = "build" ]]; then + run_build +elif [[ ${command} = "deploy" ]]; then + if [[ ${no_build} != true ]]; then + run_build + fi + main "$@" +fi From 49b341864ab1d33d213f6674549e750add376bc6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 13 Aug 2020 13:35:50 -0400 Subject: [PATCH 05/94] Bump middleman from 4.3.7 to 4.3.8 (#1302) Bumps [middleman](https://github.com/middleman/middleman) from 4.3.7 to 4.3.8. - [Release notes](https://github.com/middleman/middleman/releases) - [Changelog](https://github.com/middleman/middleman/blob/master/CHANGELOG.md) - [Commits](https://github.com/middleman/middleman/compare/v4.3.7...v4.3.8) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 252d92ac616..d108095f806 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,19 +10,19 @@ GEM public_suffix (>= 2.0.2, < 5.0) autoprefixer-rails (9.5.1.1) execjs - backports (3.17.2) + backports (3.18.1) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) contracts (0.13.0) - dotenv (2.7.5) + dotenv (2.7.6) erubis (2.7.0) execjs (2.7.0) fast_blank (1.0.0) - fastimage (2.1.7) - ffi (1.12.2) + fastimage (2.2.0) + ffi (1.13.1) haml (5.1.2) temple (>= 0.8.0) tilt @@ -31,23 +31,24 @@ GEM hashie (3.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - kramdown (1.17.0) + kramdown (2.3.0) + rexml listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) memoist (0.16.2) - middleman (4.3.7) + middleman (4.3.8) coffee-script (~> 2.2) haml (>= 4.0.5) - kramdown (~> 1.2) - middleman-cli (= 4.3.7) - middleman-core (= 4.3.7) + kramdown (>= 2.3.0) + middleman-cli (= 4.3.8) + middleman-core (= 4.3.8) middleman-autoprefixer (2.10.1) autoprefixer-rails (~> 9.1) middleman-core (>= 3.3.3) - middleman-cli (4.3.7) + middleman-cli (4.3.8) thor (>= 0.17.0, < 2.0) - middleman-core (4.3.7) + middleman-core (4.3.8) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) backports (~> 3.6) @@ -86,20 +87,21 @@ GEM tilt (>= 1.4.1, < 3) padrino-support (0.13.3.4) activesupport (>= 3.1) - parallel (1.19.1) + parallel (1.19.2) public_suffix (4.0.5) rack (2.2.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + rexml (3.2.4) rouge (3.21.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) servolux (0.13.0) sprockets (3.7.2) From 7441d835628080ac7923baa176ae158342862d4a Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 10 Sep 2020 12:28:30 -0400 Subject: [PATCH 06/94] Add deploy to gh-pages for dev branch (#1305) Signed-off-by: Matthew Peveler --- .github/workflows/deploy.yml | 1 + .github/workflows/dev_deploy.yml | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .github/workflows/dev_deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8df9d720a38..c6c318c6465 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,3 +32,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./build + keep_files: true diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml new file mode 100644 index 00000000000..48bffe1e694 --- /dev/null +++ b/.github/workflows/dev_deploy.yml @@ -0,0 +1,36 @@ +name: Dev Deploy + +on: + push: + branches: [ 'dev' ] + +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.7.0-8 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + destination_dir: dev + publish_dir: ./build + keep_files: true From db503c93fe6e03bbbde321dbe450776e5cc82802 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 10 Sep 2020 12:47:29 -0400 Subject: [PATCH 07/94] update actions/cache to v2 for gh workflows (#1314) Signed-off-by: Matthew Peveler --- .github/workflows/build.yml | 10 ++++++++-- .github/workflows/deploy.yml | 12 +++++++++--- .github/workflows/dev_deploy.yml | 12 +++++++++--- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d55c61d605..c9ec0eccb13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,16 +21,22 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: vendor/bundle key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + gems-${{ runner.os }}-${{ matrix.ruby-version }}- + gems-${{ runner.os }}- # 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 + - name: bundle install + run: | + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 - run: bundle exec middleman build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c6c318c6465..341cd5f7fbc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,13 +17,19 @@ jobs: with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: vendor/bundle - key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + gems-${{ runner.os }}-${{ matrix.ruby-version }}- + gems-${{ runner.os }}- - run: bundle config set deployment 'true' - - run: bundle install + - name: bundle install + run: | + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 - run: bundle exec middleman build diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 48bffe1e694..5a655b8ced8 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -17,13 +17,19 @@ jobs: with: ruby-version: ${{ env.ruby-version }} - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: vendor/bundle - key: gems-${{ runner.os }}-${{ env.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + key: gems-${{ runner.os }}-${{ matrix.ruby-version }}-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + gems-${{ runner.os }}-${{ matrix.ruby-version }}- + gems-${{ runner.os }}- - run: bundle config set deployment 'true' - - run: bundle install + - name: bundle install + run: | + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 - run: bundle exec middleman build From 1f9f3a2f6a6cf2a32877b1da0393241b47140017 Mon Sep 17 00:00:00 2001 From: Mike Ralphson Date: Thu, 10 Sep 2020 17:55:45 +0100 Subject: [PATCH 08/94] Remove outdated special thanks section in README.md (#1307) --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 27c0149aac2..7d15f8646eb 100644 --- a/README.md +++ b/README.md @@ -79,10 +79,3 @@ Thanks to the following people who have submitted major pull requests: - [@cvkef](https://github.com/cvkef) Also, thanks to [Sauce Labs](http://saucelabs.com) for sponsoring the development of the responsive styles. - -Special Thanks --------------------- -- [Middleman](https://github.com/middleman/middleman) -- [middleman-syntax](https://github.com/middleman/middleman-syntax) -- [middleman-gh-pages](https://github.com/edgecase/middleman-gh-pages) -- [Font Awesome](http://fortawesome.github.io/Font-Awesome/) From 54d594c314e23c83cf330d630902d4c5fe37669b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 14:25:43 -0400 Subject: [PATCH 09/94] Bump rouge from 3.21.0 to 3.23.0 (#1311) Bumps [rouge](https://github.com/rouge-ruby/rouge) from 3.21.0 to 3.23.0. - [Release notes](https://github.com/rouge-ruby/rouge/releases) - [Changelog](https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md) - [Commits](https://github.com/rouge-ruby/rouge/compare/v3.21.0...v3.23.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d108095f806..9546c674524 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) rexml (3.2.4) - rouge (3.21.0) + rouge (3.23.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) From e3137324fa876dd01382e7ad86cb807e73087063 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 11:45:34 -0400 Subject: [PATCH 10/94] Bump middleman from 4.3.8 to 4.3.10 (#1316) Bumps [middleman](https://github.com/middleman/middleman) from 4.3.8 to 4.3.10. - [Release notes](https://github.com/middleman/middleman/releases) - [Changelog](https://github.com/middleman/middleman/blob/master/CHANGELOG.md) - [Commits](https://github.com/middleman/middleman/compare/v4.3.8...v4.3.10) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9546c674524..4a2429e3577 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.3) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -10,7 +10,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) autoprefixer-rails (9.5.1.1) execjs - backports (3.18.1) + backports (3.18.2) coffee-script (2.4.1) coffee-script-source execjs @@ -37,18 +37,18 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) memoist (0.16.2) - middleman (4.3.8) + middleman (4.3.10) coffee-script (~> 2.2) haml (>= 4.0.5) kramdown (>= 2.3.0) - middleman-cli (= 4.3.8) - middleman-core (= 4.3.8) + middleman-cli (= 4.3.10) + middleman-core (= 4.3.10) middleman-autoprefixer (2.10.1) autoprefixer-rails (~> 9.1) middleman-core (>= 3.3.3) - middleman-cli (4.3.8) + middleman-cli (4.3.10) thor (>= 0.17.0, < 2.0) - middleman-core (4.3.8) + middleman-core (4.3.10) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) backports (~> 3.6) @@ -78,7 +78,7 @@ GEM middleman-core (>= 3.2) rouge (~> 3.2) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) padrino-helpers (0.13.3.4) @@ -88,7 +88,7 @@ GEM padrino-support (0.13.3.4) activesupport (>= 3.1) parallel (1.19.2) - public_suffix (4.0.5) + public_suffix (4.0.6) rack (2.2.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) From b3f5fcb6f0d799ea13fdc06b19dbb9b66071524d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:26:10 -0400 Subject: [PATCH 11/94] Bump middleman from 4.3.10 to 4.3.11 (#1319) Bumps [middleman](https://github.com/middleman/middleman) from 4.3.10 to 4.3.11. - [Release notes](https://github.com/middleman/middleman/releases) - [Changelog](https://github.com/middleman/middleman/blob/master/CHANGELOG.md) - [Commits](https://github.com/middleman/middleman/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4a2429e3577..7f71a1b423f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,18 +37,18 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) memoist (0.16.2) - middleman (4.3.10) + middleman (4.3.11) coffee-script (~> 2.2) haml (>= 4.0.5) kramdown (>= 2.3.0) - middleman-cli (= 4.3.10) - middleman-core (= 4.3.10) + middleman-cli (= 4.3.11) + middleman-core (= 4.3.11) middleman-autoprefixer (2.10.1) autoprefixer-rails (~> 9.1) middleman-core (>= 3.3.3) - middleman-cli (4.3.10) + middleman-cli (4.3.11) thor (>= 0.17.0, < 2.0) - middleman-core (4.3.10) + middleman-core (4.3.11) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) backports (~> 3.6) From 3af62c84a5e6a9adcc1e2b03ef76db48e5a88533 Mon Sep 17 00:00:00 2001 From: Mike Ralphson Date: Wed, 23 Sep 2020 04:07:24 +0100 Subject: [PATCH 12/94] upgrade lunr to 2.3.9 (#1325) Signed-off-by: Mike Ralphson --- source/javascripts/lib/_lunr.js | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/source/javascripts/lib/_lunr.js b/source/javascripts/lib/_lunr.js index c3537658a62..6aa370fbcb7 100644 --- a/source/javascripts/lib/_lunr.js +++ b/source/javascripts/lib/_lunr.js @@ -1,6 +1,6 @@ /** - * lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 2.3.8 - * Copyright (C) 2019 Oliver Nightingale + * lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 2.3.9 + * Copyright (C) 2020 Oliver Nightingale * @license MIT */ @@ -54,10 +54,10 @@ var lunr = function (config) { return builder.build() } -lunr.version = "2.3.8" +lunr.version = "2.3.9" /*! * lunr.utils - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -177,7 +177,7 @@ lunr.FieldRef.prototype.toString = function () { } /*! * lunr.Set - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -211,8 +211,8 @@ lunr.Set.complete = { return other }, - union: function (other) { - return other + union: function () { + return this }, contains: function () { @@ -389,7 +389,7 @@ lunr.Token.prototype.clone = function (fn) { } /*! * lunr.tokenizer - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -465,7 +465,7 @@ lunr.tokenizer = function (obj, metadata) { lunr.tokenizer.separator = /[\s\-]+/ /*! * lunr.Pipeline - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -732,7 +732,7 @@ lunr.Pipeline.prototype.toJSON = function () { } /*! * lunr.Vector - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -929,7 +929,7 @@ lunr.Vector.prototype.toJSON = function () { /* eslint-disable */ /*! * lunr.stemmer - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale * Includes code from - http://tartarus.org/~martin/PorterStemmer/js.txt */ @@ -1151,7 +1151,7 @@ lunr.stemmer = (function(){ lunr.Pipeline.registerFunction(lunr.stemmer, 'stemmer') /*! * lunr.stopWordFilter - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -1316,7 +1316,7 @@ lunr.stopWordFilter = lunr.generateStopWordFilter([ lunr.Pipeline.registerFunction(lunr.stopWordFilter, 'stopWordFilter') /*! * lunr.trimmer - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -1343,7 +1343,7 @@ lunr.trimmer = function (token) { lunr.Pipeline.registerFunction(lunr.trimmer, 'trimmer') /*! * lunr.TokenSet - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -1827,7 +1827,7 @@ lunr.TokenSet.Builder.prototype.minimize = function (downTo) { } /*! * lunr.Index - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** @@ -1994,7 +1994,7 @@ lunr.Index.prototype.query = function (fn) { */ var clause = query.clauses[i], terms = null, - clauseMatches = lunr.Set.complete + clauseMatches = lunr.Set.empty if (clause.usePipeline) { terms = this.pipeline.runString(clause.term, { @@ -2319,7 +2319,7 @@ lunr.Index.load = function (serializedIndex) { } /*! * lunr.Builder - * Copyright (C) 2019 Oliver Nightingale + * Copyright (C) 2020 Oliver Nightingale */ /** From de961f53addd699af8ac222cb37f2407a4bd2186 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 19:35:53 -0400 Subject: [PATCH 13/94] Bump rouge from 3.23.0 to 3.24.0 (#1334) Bumps [rouge](https://github.com/rouge-ruby/rouge) from 3.23.0 to 3.24.0. - [Release notes](https://github.com/rouge-ruby/rouge/releases) - [Changelog](https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md) - [Commits](https://github.com/rouge-ruby/rouge/compare/v3.23.0...v3.24.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7f71a1b423f..18dd6ad2ff4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) rexml (3.2.4) - rouge (3.23.0) + rouge (3.24.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) From 779658de7bf58e29a6531a4a31fe33c4f142c5e1 Mon Sep 17 00:00:00 2001 From: Michael Bang Date: Mon, 26 Oct 2020 19:31:15 +0100 Subject: [PATCH 14/94] Dockerfile: allow Docker to cache build steps (#1336) - By having a `COPY . xx` step before installing dependencies, we rob Docker of the opportunity to cache downloading and building dependencies if we make any changes to any files in the repository. By copying only Gemfiles before the build step, we only require Docker to rebuild dependencies when the Gemfiles have changed. Co-authored-by: Matthew Peveler --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c74158d5bf9..efb59a3c711 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,8 @@ VOLUME /srv/slate/source EXPOSE 4567 -COPY . /srv/slate +COPY Gemfile . +COPY Gemfile.lock . RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -17,8 +18,11 @@ RUN apt-get update \ && bundle install \ && apt-get remove -y build-essential \ && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - && chmod +x /srv/slate/slate.sh + && rm -rf /var/lib/apt/lists/* + +COPY . /srv/slate + +RUN chmod +x /srv/slate/slate.sh ENTRYPOINT ["/srv/slate/slate.sh"] CMD ["build"] From 0e242e323be13253dbdd3bfc02ea004af5b56e6c Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 27 Oct 2020 20:42:44 +0200 Subject: [PATCH 15/94] add docker deploy step to github workflows (#1321) Signed-off-by: Matthew Peveler --- .github/workflows/dev_deploy.yml | 8 ++++++++ .github/workflows/publish.yml | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 5a655b8ced8..7f1a40abf5d 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -33,6 +33,14 @@ jobs: - run: bundle exec middleman build + - name: Push to Docker Hub + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_ACCESS_KEY }} + repository: slatedocs/slate + tag_with_ref: true + - name: Deploy uses: peaceiris/actions-gh-pages@v3.7.0-8 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000000..d57930a5842 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,22 @@ +name: Publish Docker image + +on: + release: + types: [published] + +jobs: + push_to_registry: + name: Push Docker image to Docker Hub + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + + - name: Push to Docker Hub + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_ACCESS_KEY }} + repository: slatedocs/slate + tag_with_ref: true + tags: latest From e40f9be0c03c1a5405f235054156150f9be60069 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 27 Oct 2020 20:47:45 +0200 Subject: [PATCH 16/94] Fix shell code examples to have line continuations (#1324) --- source/index.html.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/index.html.md b/source/index.html.md index 1bf6780af1d..f4be8c6a762 100644 --- a/source/index.html.md +++ b/source/index.html.md @@ -45,7 +45,7 @@ api = kittn.authorize('meowmeowmeow') ```shell # With shell, you can just pass the correct header with each request -curl "api_endpoint_here" +curl "api_endpoint_here" \ -H "Authorization: meowmeowmeow" ``` @@ -86,7 +86,7 @@ api.kittens.get() ``` ```shell -curl "http://example.com/api/kittens" +curl "http://example.com/api/kittens" \ -H "Authorization: meowmeowmeow" ``` @@ -152,7 +152,7 @@ api.kittens.get(2) ``` ```shell -curl "http://example.com/api/kittens/2" +curl "http://example.com/api/kittens/2" \ -H "Authorization: meowmeowmeow" ``` @@ -206,8 +206,8 @@ api.kittens.delete(2) ``` ```shell -curl "http://example.com/api/kittens/2" - -X DELETE +curl "http://example.com/api/kittens/2" \ + -X DELETE \ -H "Authorization: meowmeowmeow" ``` From 24b1d1fd51c0a8bc3016bd6b85e4a48d267bfe20 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 27 Oct 2020 19:21:49 +0000 Subject: [PATCH 17/94] cut 2.8.0 release Signed-off-by: Matthew Peveler --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30b9e1f1713..1ffe3eb851a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## Version 2.8.0 + +*October 27, 2020* + +* Remove last trailing newline when using the copy code button +* Rework docker image and make available at slatedocs/slate +* Improve Dockerfile layout to improve caching (thanks @micvbang) +* Bump rouge from 3.20 to 3.24 +* Bump nokogiri from 1.10.9 to 1.10.10 +* Bump middleman from 4.3.8 to 4.3.11 +* Bump lunr.js from 2.3.8 to 2.3.9 + ## Version 2.7.1 *August 13, 2020* From ede86c358f6fd917b29c88ddc0972b123d86af5d Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 10 Nov 2020 20:29:26 +0200 Subject: [PATCH 18/94] Update command to fetch latest commit for issue template (#1342) Signed-off-by: Matthew Peveler --- .github/ISSUE_TEMPLATE/bug.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 25fcdb1d2e0..43305a233da 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -18,5 +18,5 @@ If applicable, add screenshots to help explain your problem. - Browser [e.g. chrome, safari] - Version [e.g. 22] -**Last upstream Slate commit (run `git log --author="Robert Lord" | head -n 1`):** +**Last upstream Slate commit (run `git log --author="\(Robert Lord\)\|\(Matthew Peveler\)\|\(Mike Ralphson\)" | head -n 1`):** Put the commit hash here From d46c55f9427532f53f2276b7a87cb0434d4e7437 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Wed, 28 Oct 2020 02:41:28 +0000 Subject: [PATCH 19/94] add docker version badge to README Signed-off-by: Matthew Peveler --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7d15f8646eb..134dd8d5505 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Slate: API Documentation Generator
Build Status + Docker Version

Slate helps you create beautiful, intelligent, responsive API documentation.

From e546ad54c52d56089fee9c1376f18598d6408264 Mon Sep 17 00:00:00 2001 From: Victor E F Date: Wed, 16 Dec 2020 18:22:51 -0800 Subject: [PATCH 20/94] Fix vagrant issue: use exact version of bundler (#1355) I was getting this error, ''Cant find gem bundler (>= 0.a) with executable bundle', after I ran `vagrant up`. The version of RubyGem installed in the vagrant box cannot find the exact version of Bundler listed in Gemfile.lock. This solution ensures that the exact bundler version installed in Gemfile.lock is installed before running `bundle install`. The issue is solved in RubyGems >= 2.7.10 and Ruby >=2.6.3. This solution ensures a fix without requiring a more complicated upgrade. More information found here: https://bundler.io/blog/2019/05/14/solutions-for-cant-find-gem-bundler-with-executable-bundle.html --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index 4166fb6ba24..200839d0222 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -28,6 +28,7 @@ Vagrant.configure(2) do |config| echo "==============================================" echo "Installing app dependencies" cd /vagrant + sudo gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" bundle config build.nokogiri --use-system-libraries bundle install SHELL From b9638521ba0a52a3297208a4838e92fa51e96991 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2020 02:06:01 -0500 Subject: [PATCH 21/94] Bump rouge from 3.24.0 to 3.25.0 (#1343) Bumps [rouge](https://github.com/rouge-ruby/rouge) from 3.24.0 to 3.25.0. - [Release notes](https://github.com/rouge-ruby/rouge/releases) - [Changelog](https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md) - [Commits](https://github.com/rouge-ruby/rouge/compare/v3.24.0...v3.25.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 18dd6ad2ff4..e49209fd93a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) rexml (3.2.4) - rouge (3.24.0) + rouge (3.25.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) From a3dee6a20decdfcdb6f40f8b50f2660b6be86f88 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 9 Dec 2020 11:07:02 -0500 Subject: [PATCH 22/94] Bump rouge from 3.25.0 to 3.26.0 (#1350) Bumps [rouge](https://github.com/rouge-ruby/rouge) from 3.25.0 to 3.26.0. - [Release notes](https://github.com/rouge-ruby/rouge/releases) - [Changelog](https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md) - [Commits](https://github.com/rouge-ruby/rouge/compare/v3.25.0...v3.26.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e49209fd93a..b4bd9841dac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM ffi (~> 1.0) redcarpet (3.5.0) rexml (3.2.4) - rouge (3.25.0) + rouge (3.26.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) From b5ac2a195b53a296a4b7bb77eda1a06cc8ebe417 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 16 Dec 2020 09:29:23 -0500 Subject: [PATCH 23/94] Bump redcarpet from 3.5.0 to 3.5.1 (#1352) Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/vmg/redcarpet/releases) - [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md) - [Commits](https://github.com/vmg/redcarpet/compare/v3.5.0...v3.5.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b4bd9841dac..b902df12dcd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.0) + redcarpet (3.5.1) rexml (3.2.4) rouge (3.26.0) sass (3.7.4) From 10d4a53a54c76aa74261c11943ad982c6eeb3711 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Wed, 16 Dec 2020 21:23:04 -0500 Subject: [PATCH 24/94] Update link to ruby languages in README (#1351) Signed-off-By: Matthew Peveler --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 134dd8d5505..c51483a2af5 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Features * **Write code samples in multiple languages** — If your API has bindings in multiple programming languages, you can easily put in tabs to switch between them. In your document, you'll distinguish different languages by specifying the language name at the top of each code block, just like with GitHub Flavored Markdown. -* **Out-of-the-box syntax highlighting** for [over 100 languages](https://github.com/jneen/rouge/wiki/List-of-supported-languages-and-lexers), no configuration required. +* **Out-of-the-box syntax highlighting** for [over 100 languages](https://github.com/rouge-ruby/rouge/wiki/List-of-supported-languages-and-lexers), no configuration required. * **Automatic, smoothly scrolling table of contents** on the far left of the page. As you scroll, it displays your current position in the document. It's fast, too. We're using Slate at TripIt to build documentation for our new API, where our table of contents has over 180 entries. We've made sure that the performance remains excellent, even for larger documents. From a1e14a57505cd1a72b76d9f605cea9b56e8b0976 Mon Sep 17 00:00:00 2001 From: Courtenay Date: Thu, 14 Jan 2021 05:22:25 -0800 Subject: [PATCH 25/94] Remove scale from README examples (#1363) They've switched to readme.io --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c51483a2af5..2744e63b7a8 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,6 @@ Companies Using Slate * [Clearbit](https://clearbit.com/docs) * [Coinbase](https://developers.coinbase.com/api) * [Parrot Drones](http://developer.parrot.com/docs/bebop/) -* [Scale](https://docs.scaleapi.com/) You can view more in [the list on the wiki](https://github.com/slatedocs/slate/wiki/Slate-in-the-Wild). From 72f91e286fa5b2a542387322ebc7d1e14aaef481 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 14 Jan 2021 08:37:51 -0500 Subject: [PATCH 26/94] Drop support for Ruby 2.3 and 2.4 (#1366) Signed-off-By: Matthew Peveler --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9ec0eccb13..434c8d0933d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7] steps: - uses: actions/checkout@v2 From 6163c81ed05ec4736482395d854d6b6062bf5c67 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 14 Jan 2021 13:15:48 -0500 Subject: [PATCH 27/94] Update supported ruby version in Gemfile Signed-off-by: Matthew Peveler --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4dc664df2f5..1f8df435e5d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '>=2.3.1' +ruby '>=2.5.0' source 'https://rubygems.org' # Middleman diff --git a/Gemfile.lock b/Gemfile.lock index b902df12dcd..0db6d0e22f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,7 +130,7 @@ DEPENDENCIES sass RUBY VERSION - ruby 2.3.3p222 + ruby 2.7.2p137 BUNDLED WITH 2.1.4 From 6e9d009138623d5f37501354d08f49c2e49030f7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 13:38:56 -0500 Subject: [PATCH 28/94] [Security] Bump nokogiri from 1.10.10 to 1.11.0 (#1360) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0. **This update includes a security fix.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 1f8df435e5d..c71cf80580f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,5 +8,5 @@ gem 'middleman-autoprefixer', '~> 2.7' gem 'middleman-sprockets', '~> 4.1' gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' -gem 'nokogiri', '~> 1.10.8' +gem 'nokogiri', '~> 1.11.0' gem 'sass' diff --git a/Gemfile.lock b/Gemfile.lock index 0db6d0e22f2..f57b015d88a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,10 +77,11 @@ GEM middleman-syntax (3.2.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.0) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) padrino-helpers (0.13.3.4) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.13.3.4) @@ -89,6 +90,7 @@ GEM activesupport (>= 3.1) parallel (1.19.2) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -124,7 +126,7 @@ DEPENDENCIES middleman-autoprefixer (~> 2.7) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) - nokogiri (~> 1.10.8) + nokogiri (~> 1.11.0) redcarpet (~> 3.5.0) rouge (~> 3.21) sass From 200e4c0383a961ed6478352a22aedd16e21984cc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 13:21:53 -0500 Subject: [PATCH 29/94] Bump nokogiri from 1.11.0 to 1.11.1 (#1370) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.0...v1.11.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f57b015d88a..5b7dd0add06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM rouge (~> 3.2) mini_portile2 (2.5.0) minitest (5.14.2) - nokogiri (1.11.0) + nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) padrino-helpers (0.13.3.4) From b56d145c7b476defa54f26bbb409cf4ce4e254fe Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Mon, 18 Jan 2021 13:25:59 -0500 Subject: [PATCH 30/94] Update changelog for 2.9.0 Signed-off-by: Matthew Peveler --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ffe3eb851a..1e29f7b5484 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Version 2.8.0 +*January 19, 2021* + +* __Drop support for Ruby 2.3 and 2.4__ +* __[Security]__ Bump nokogiri from 1.10.10 to 1.11.1 +* __[Security]__ Bump redcarpet from 3.5.0 to 3.5.1 +* Bump rouge from 3.24.0 to 3.26.0 + *October 27, 2020* * Remove last trailing newline when using the copy code button From 11bcd78f38a126027744db19421663b04a62f59c Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Mon, 18 Jan 2021 13:39:54 -0500 Subject: [PATCH 31/94] Specify slate is not Ruby 3.0 compatible Signed-off-by: Matthew Peveler --- CHANGELOG.md | 1 + Gemfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e29f7b5484..dcf544971ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * __Drop support for Ruby 2.3 and 2.4__ * __[Security]__ Bump nokogiri from 1.10.10 to 1.11.1 * __[Security]__ Bump redcarpet from 3.5.0 to 3.5.1 +* Specify slate is not supported on Ruby 3.x * Bump rouge from 3.24.0 to 3.26.0 *October 27, 2020* diff --git a/Gemfile b/Gemfile index c71cf80580f..a10cfaf39a6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '>=2.5.0' +ruby '~> 2.5' source 'https://rubygems.org' # Middleman From e3a3a3a8b4d66e4168525bf61a918e3e3964563c Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 26 Jan 2021 17:25:03 -0500 Subject: [PATCH 32/94] Fix changelog entry for 2.9.0 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf544971ca..a5505099e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Version 2.8.0 +## Version 2.9.0 *January 19, 2021* @@ -10,6 +10,8 @@ * Specify slate is not supported on Ruby 3.x * Bump rouge from 3.24.0 to 3.26.0 +## Version 2.8.0 + *October 27, 2020* * Remove last trailing newline when using the copy code button From 681f4818a50510ffa6965e3d4803f48e75d78f57 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 25 Feb 2021 09:25:55 -0500 Subject: [PATCH 33/94] Add guards around localStorage in case user disables it (#1399) Signed-off-by: Matthew Peveler --- source/javascripts/app/_lang.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source/javascripts/app/_lang.js b/source/javascripts/app/_lang.js index 0fbaaef7046..cc5ac8b6bd8 100644 --- a/source/javascripts/app/_lang.js +++ b/source/javascripts/app/_lang.js @@ -129,11 +129,16 @@ under the License. history.pushState({}, '', '?' + generateNewQueryString(language) + '#' + hash); // save language as next default - localStorage.setItem("language", language); + if (localStorage) { + localStorage.setItem("language", language); + } } function setupLanguages(l) { - var defaultLanguage = localStorage.getItem("language"); + var defaultLanguage = null; + if (localStorage) { + defaultLanguage = localStorage.getItem("language"); + } languages = l; @@ -142,7 +147,9 @@ under the License. // the language is in the URL, so use that language! activateLanguage(presetLanguage); - localStorage.setItem("language", presetLanguage); + if (localStorage) { + localStorage.setItem("language", presetLanguage); + } } else if ((defaultLanguage !== null) && (jQuery.inArray(defaultLanguage, languages) != -1)) { // the language was the last selected one saved in localstorage, so use that language! activateLanguage(defaultLanguage); From 8488edf2d7eec2a28d035b36f3df130811a29bed Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Sat, 27 Feb 2021 18:44:13 -0500 Subject: [PATCH 34/94] cut 2.9.1 release (#1400) Signed-off-by: Matthew Peveler --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5505099e90..a16fae977dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Version 2.9.1 + +*February 27, 2021* + +* Fix Slate language tabs not working if localStorage is disabled + ## Version 2.9.0 *January 19, 2021* From 9aed5466f31fb14d1de6b08e3e7dc522b8a1438c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 14 Mar 2021 18:32:12 -0400 Subject: [PATCH 35/94] Bump nokogiri from 1.11.1 to 1.11.2 (#1407) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.11.2. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.1...v1.11.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5b7dd0add06..48491a59659 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM rouge (~> 3.2) mini_portile2 (2.5.0) minitest (5.14.2) - nokogiri (1.11.1) + nokogiri (1.11.2) mini_portile2 (~> 2.5.0) racc (~> 1.4) padrino-helpers (0.13.3.4) From 3519c551cf3974be028cc81c0d9c569ee0596b92 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 18:23:03 -0400 Subject: [PATCH 36/94] [Security] Bump kramdown from 2.3.0 to 2.3.1 (#1416) Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1. **This update includes a security fix.** - [Release notes](https://github.com/gettalong/kramdown/releases) - [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page) - [Commits](https://github.com/gettalong/kramdown/commits) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 48491a59659..2173034d5a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,7 @@ GEM hashie (3.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - kramdown (2.3.0) + kramdown (2.3.1) rexml listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) From fa3a7cf165aa7caf3313f483ffc42c25093fccad Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 30 Mar 2021 07:44:29 -0400 Subject: [PATCH 37/94] cut 2.9.2 release Signed-off-by: Matthew Peveler --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a16fae977dd..564f0f34d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Version 2.9.2 + +*March 30, 2021* + +* __[Security]__ Bump kramdown from 2.3.0 to 2.3.1 +* Bump nokogiri from 1.11.1 to 1.11.2 + ## Version 2.9.1 *February 27, 2021* From e08e38cdc17dad7b7ac62512b1c6b3f7dadc8434 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 07:54:29 -0400 Subject: [PATCH 38/94] Bump nokogiri from 1.11.2 to 1.11.3 (#1425) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.3) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2173034d5a0..254c1ada4f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM rouge (~> 3.2) mini_portile2 (2.5.0) minitest (5.14.2) - nokogiri (1.11.2) + nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) padrino-helpers (0.13.3.4) From bf2f1ebbec3e72727c9c56a6768ad87b253b8b85 Mon Sep 17 00:00:00 2001 From: Shaun VanWeelden Date: Thu, 8 Apr 2021 14:06:38 -0500 Subject: [PATCH 39/94] Make slate compatible with ruby 3.0.0 (#1424) --- .github/workflows/build.yml | 2 +- Gemfile | 5 +- Gemfile.lock | 97 +++++++++++++++++++++---------------- 3 files changed, 59 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 434c8d0933d..f705b7e7af4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7, 3.0] steps: - uses: actions/checkout@v2 diff --git a/Gemfile b/Gemfile index a10cfaf39a6..3897dffde8f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ -ruby '~> 2.5' +ruby '>= 2.5' source 'https://rubygems.org' # Middleman -gem 'middleman', '~>4.3' +gem 'middleman', :github => 'middleman/middleman', :branch => '4.x' gem 'middleman-syntax', '~> 3.2' gem 'middleman-autoprefixer', '~> 2.7' gem 'middleman-sprockets', '~> 4.1' @@ -10,3 +10,4 @@ gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' gem 'nokogiri', '~> 1.11.0' gem 'sass' +gem 'webrick' diff --git a/Gemfile.lock b/Gemfile.lock index 254c1ada4f4..f247941e0bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,46 @@ +GIT + remote: https://github.com/middleman/middleman.git + revision: 0c950d82f6f4f540e8572195f80c9a9fb15ab80c + branch: 4.x + specs: + middleman (4.3.11) + coffee-script (~> 2.2) + haml (>= 4.0.5) + kramdown (>= 2.3.0) + middleman-cli (= 4.3.11) + middleman-core (= 4.3.11) + middleman-cli (4.3.11) + thor (>= 0.17.0, < 2.0) + middleman-core (4.3.11) + activesupport (>= 4.2, < 6.0) + addressable (~> 2.3) + backports (~> 3.6) + bundler (~> 2.0) + contracts (~> 0.13.0) + dotenv + erubis + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) + i18n (~> 0.9.0) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.13.0) + parallel + rack (>= 1.4.5, < 3) + sassc (~> 2.0) + servolux + tilt (~> 2.0.9) + toml + uglifier (~> 3.0) + webrick + GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -10,7 +49,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) autoprefixer-rails (9.5.1.1) execjs - backports (3.18.2) + backports (3.21.0) coffee-script (2.4.1) coffee-script-source execjs @@ -21,9 +60,9 @@ GEM erubis (2.7.0) execjs (2.7.0) fast_blank (1.0.0) - fastimage (2.2.0) + fastimage (2.2.3) ffi (1.13.1) - haml (5.1.2) + haml (5.2.1) temple (>= 0.8.0) tilt hamster (3.0.0) @@ -37,40 +76,9 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) memoist (0.16.2) - middleman (4.3.11) - coffee-script (~> 2.2) - haml (>= 4.0.5) - kramdown (>= 2.3.0) - middleman-cli (= 4.3.11) - middleman-core (= 4.3.11) middleman-autoprefixer (2.10.1) autoprefixer-rails (~> 9.1) middleman-core (>= 3.3.3) - middleman-cli (4.3.11) - thor (>= 0.17.0, < 2.0) - middleman-core (4.3.11) - activesupport (>= 4.2, < 6.0) - addressable (~> 2.3) - backports (~> 3.6) - bundler - contracts (~> 0.13.0) - dotenv - erubis - execjs (~> 2.0) - fast_blank - fastimage (~> 2.0) - hamster (~> 3.0) - hashie (~> 3.4) - i18n (~> 0.9.0) - listen (~> 3.0.0) - memoist (~> 0.14) - padrino-helpers (~> 0.13.0) - parallel - rack (>= 1.4.5, < 3) - sassc (~> 2.0) - servolux - tilt (~> 2.0.9) - uglifier (~> 3.0) middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) @@ -78,7 +86,7 @@ GEM middleman-core (>= 3.2) rouge (~> 3.2) mini_portile2 (2.5.0) - minitest (5.14.2) + minitest (5.14.4) nokogiri (1.11.3) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -88,7 +96,8 @@ GEM tilt (>= 1.4.1, < 3) padrino-support (0.13.3.4) activesupport (>= 3.1) - parallel (1.19.2) + parallel (1.20.1) + parslet (1.8.2) public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) @@ -96,7 +105,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) - rexml (3.2.4) + rexml (3.2.5) rouge (3.26.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -110,19 +119,22 @@ GEM concurrent-ruby (~> 1.0) rack (> 1, < 3) temple (0.8.2) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + toml (0.2.0) + parslet (~> 1.8.0) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) + webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - middleman (~> 4.3) + middleman! middleman-autoprefixer (~> 2.7) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) @@ -130,9 +142,10 @@ DEPENDENCIES redcarpet (~> 3.5.0) rouge (~> 3.21) sass + webrick RUBY VERSION ruby 2.7.2p137 BUNDLED WITH - 2.1.4 + 2.2.15 From 161eb66382724881909181cf5e677eba0d1c0fea Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 8 Apr 2021 15:24:53 -0400 Subject: [PATCH 40/94] Add git to Dockerfile (#1426) Signed-off-by: Matthew Peveler --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index efb59a3c711..504da654d10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,11 @@ COPY Gemfile.lock . RUN apt-get update \ && apt-get install -y --no-install-recommends \ build-essential \ + git \ nodejs \ && gem install bundler \ && bundle install \ - && apt-get remove -y build-essential \ + && apt-get remove -y build-essential git \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* From 91ae1d2110b8f6cafba4e9894f29f65161b9dcbf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 08:33:45 -0400 Subject: [PATCH 41/94] Bump middleman from `0c950d8` to `d180ca3` (#1427) Bumps [middleman](https://github.com/middleman/middleman) from `0c950d8` to `d180ca3`. - [Release notes](https://github.com/middleman/middleman/releases) - [Commits](https://github.com/middleman/middleman/compare/0c950d82f6f4f540e8572195f80c9a9fb15ab80c...d180ca337202873f2601310c74ba2b6b4cf063ec) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- Gemfile.lock | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f247941e0bf..e2f55c62802 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/middleman/middleman.git - revision: 0c950d82f6f4f540e8572195f80c9a9fb15ab80c + revision: d180ca337202873f2601310c74ba2b6b4cf063ec branch: 4.x specs: middleman (4.3.11) @@ -12,7 +12,7 @@ GIT middleman-cli (4.3.11) thor (>= 0.17.0, < 2.0) middleman-core (4.3.11) - activesupport (>= 4.2, < 6.0) + activesupport (>= 4.2, < 6.1) addressable (~> 2.3) backports (~> 3.6) bundler (~> 2.0) @@ -40,11 +40,12 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (5.2.5) + activesupport (6.0.3.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) autoprefixer-rails (9.5.1.1) @@ -54,14 +55,14 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) contracts (0.13.0) dotenv (2.7.6) erubis (2.7.0) execjs (2.7.0) fast_blank (1.0.0) fastimage (2.2.3) - ffi (1.13.1) + ffi (1.15.0) haml (5.2.1) temple (>= 0.8.0) tilt @@ -129,6 +130,7 @@ GEM uglifier (3.2.0) execjs (>= 0.3.0, < 3) webrick (1.7.0) + zeitwerk (2.4.2) PLATFORMS ruby From 7a555b5c29283baaf40b141f1b295f00429d3e56 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 15 Apr 2021 21:33:25 -0400 Subject: [PATCH 42/94] cut 2.10.0 release (#1428) Signed-off-by: Matthew Peveler --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 564f0f34d1a..55dfc05a6cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## Version 2.10.0 + +*April 13, 2021* + +* Add support for Ruby 3.0 (thanks @shaun-scale) +* Add requirement for Git on installing dependencies +* Bump nokogiri from 1.11.2 to 1.11.3 +* Bump middleman from 4.3.11 to [`d180ca3`](https://github.com/middleman/middleman/commit/d180ca337202873f2601310c74ba2b6b4cf063ec) + ## Version 2.9.2 *March 30, 2021* From 50c927185f26affbdb47e6fa08a92f13900f4ab5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 00:36:22 -0400 Subject: [PATCH 43/94] Upgrade to GitHub-native Dependabot (#1435) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..d17e8826d4f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +version: 2 +updates: +- package-ecosystem: bundler + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + target-branch: dev + versioning-strategy: increase-if-necessary From 838257283b256f76931ef2a6614c76388b63461f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 May 2021 13:18:47 -0400 Subject: [PATCH 44/94] Bump nokogiri from 1.11.3 to 1.11.5 (#1446) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e2f55c62802..17ba5b84dc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,9 +86,9 @@ GEM middleman-syntax (3.2.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.14.4) - nokogiri (1.11.3) + nokogiri (1.11.5) mini_portile2 (~> 2.5.0) racc (~> 1.4) padrino-helpers (0.13.3.4) From 3164dd97e0a4ae0c38175eebf87d4ad3aeee8f9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 May 2021 13:19:11 -0400 Subject: [PATCH 45/94] Bump middleman-autoprefixer from 2.10.1 to 3.0.0 (#1445) Bumps [middleman-autoprefixer](https://github.com/middleman/middleman-autoprefixer) from 2.10.1 to 3.0.0. - [Release notes](https://github.com/middleman/middleman-autoprefixer/releases) - [Changelog](https://github.com/middleman/middleman-autoprefixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/middleman/middleman-autoprefixer/compare/v2.10.1...v3.0.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 3897dffde8f..17231cf17fa 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' # Middleman gem 'middleman', :github => 'middleman/middleman', :branch => '4.x' gem 'middleman-syntax', '~> 3.2' -gem 'middleman-autoprefixer', '~> 2.7' +gem 'middleman-autoprefixer', '~> 3.0' gem 'middleman-sprockets', '~> 4.1' gem 'rouge', '~> 3.21' gem 'redcarpet', '~> 3.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 17ba5b84dc5..2bb2e152e12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.6) + activesupport (6.0.3.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -48,8 +48,8 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - autoprefixer-rails (9.5.1.1) - execjs + autoprefixer-rails (10.2.5.0) + execjs (< 2.8.0) backports (3.21.0) coffee-script (2.4.1) coffee-script-source @@ -77,9 +77,9 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) memoist (0.16.2) - middleman-autoprefixer (2.10.1) - autoprefixer-rails (~> 9.1) - middleman-core (>= 3.3.3) + middleman-autoprefixer (3.0.0) + autoprefixer-rails (~> 10.0) + middleman-core (>= 4.0.0) middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) @@ -102,7 +102,7 @@ GEM public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) - rb-fsevent (0.10.4) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) @@ -137,7 +137,7 @@ PLATFORMS DEPENDENCIES middleman! - middleman-autoprefixer (~> 2.7) + middleman-autoprefixer (~> 3.0) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) nokogiri (~> 1.11.0) From 56f452f4341dd67b06d638f8ac2192731d854491 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 10:30:52 -0400 Subject: [PATCH 46/94] Bump nokogiri from 1.11.5 to 1.11.6 (#1450) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.5 to 1.11.6. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.5...v1.11.6) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2bb2e152e12..0e2d5c73995 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM rouge (~> 3.2) mini_portile2 (2.5.1) minitest (5.14.4) - nokogiri (1.11.5) + nokogiri (1.11.6) mini_portile2 (~> 2.5.0) racc (~> 1.4) padrino-helpers (0.13.3.4) From ef098323185e4f46b4208ad0eacc0efa3d0098e2 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Mon, 31 May 2021 11:31:41 -0400 Subject: [PATCH 47/94] Support specifying custom meta tags in YAML (#1453) --- source/layouts/layout.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index c125d66a98f..20309180464 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -29,6 +29,15 @@ under the License. + <% if current_page.data.key?('meta') %> + <% current_page.data.meta.each do |meta| %> + + <%= "#{key}=\"#{value}\"" %> + <% end %> + > + <% end %> + <% end %> <%= current_page.data.title || "API Documentation" %>