diff --git a/restful-notes-slate/slate/CHANGELOG.md b/restful-notes-slate/slate/CHANGELOG.md index 568509d..49b83dc 100644 --- a/restful-notes-slate/slate/CHANGELOG.md +++ b/restful-notes-slate/slate/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## Version 2.13.1 + +*January 31, 2023* + +* Fix Vagrantfile gem install for ruby >= 2.6 (thanks @Cyb0rk) +* Disable file watcher in run_build() for sake of qemu on arm64 (thanks @anapsix) +* Expand deprecated git.io links to full url in docs (thanks @judge2020) +* Add margin to paragraph following code-block on phones (thanks @tlhunter) +* Bump nokogiri from 1.13.4 to 1.13.9 +* Bump rouge from 3.28.0 to 3.30.0 +* Bump redcarpet from 3.5.1 to 3.6.0 +* Bump middleman from 4.4.2 to 4.4.3 +* Bump middleman-syntax from 3.2.0 to 3.3.0 +* Bump webrick from 1.7.0 to 1.8.1 + +## Version 2.13.0 + +*April 22, 2022* + +* __Drop support for ruby 2.5__ +* Bump rouge from 3.26.1 to 3.28.0 +* Formally support ruby 3.1 +* Bump nokogiri from 1.12.5 to 1.13.4 +* Build docker images for multiple architectures (e.g. `aarch64`) +* Remove `VOLUME` declaration from Dockerfile (thanks @aemengo) + +The security vulnerabilities reported against recent versions of nokogiri should not affect slate users with a regular setup. + ## Version 2.12.0 *November 04, 2021* diff --git a/restful-notes-slate/slate/CODE_OF_CONDUCT.md b/restful-notes-slate/slate/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..cc17fd9 --- /dev/null +++ b/restful-notes-slate/slate/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@lord.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/restful-notes-slate/slate/Dockerfile b/restful-notes-slate/slate/Dockerfile index 504da65..077ef3b 100644 --- a/restful-notes-slate/slate/Dockerfile +++ b/restful-notes-slate/slate/Dockerfile @@ -2,9 +2,6 @@ FROM ruby:2.6-slim WORKDIR /srv/slate -VOLUME /srv/slate/build -VOLUME /srv/slate/source - EXPOSE 4567 COPY Gemfile . diff --git a/restful-notes-slate/slate/Gemfile b/restful-notes-slate/slate/Gemfile index 3b8c130..f2e8441 100644 --- a/restful-notes-slate/slate/Gemfile +++ b/restful-notes-slate/slate/Gemfile @@ -1,4 +1,4 @@ -ruby '>= 2.5' +ruby '>= 2.6' source 'https://rubygems.org' # Middleman @@ -7,7 +7,7 @@ gem 'middleman-syntax', '~> 3.2' gem 'middleman-autoprefixer', '~> 3.0' gem 'middleman-sprockets', '~> 4.1' gem 'rouge', '~> 3.21' -gem 'redcarpet', '~> 3.5.0' -gem 'nokogiri', '~> 1.12.1' +gem 'redcarpet', '~> 3.6.0' +gem 'nokogiri', '~> 1.13.3' gem 'sass' gem 'webrick' diff --git a/restful-notes-slate/slate/Gemfile.lock b/restful-notes-slate/slate/Gemfile.lock index 1870221..79bfbcb 100644 --- a/restful-notes-slate/slate/Gemfile.lock +++ b/restful-notes-slate/slate/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4.1) + activesupport (6.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) autoprefixer-rails (10.2.5.0) execjs (< 2.8.0) - backports (3.21.0) + backports (3.23.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) - contracts (0.13.0) - dotenv (2.7.6) + concurrent-ruby (1.2.0) + contracts (0.16.1) + dotenv (2.8.1) erubis (2.7.0) execjs (2.7.0) fast_blank (1.0.1) - fastimage (2.2.5) - ffi (1.15.4) + fastimage (2.2.6) + ffi (1.15.5) haml (5.2.2) temple (>= 0.8.0) tilt @@ -32,29 +32,29 @@ GEM hashie (3.6.0) i18n (1.6.0) concurrent-ruby (~> 1.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) memoist (0.16.2) - middleman (4.4.2) + middleman (4.4.3) coffee-script (~> 2.2) - haml (>= 4.0.5) + haml (>= 4.0.5, < 6.0) kramdown (>= 2.3.0) - middleman-cli (= 4.4.2) - middleman-core (= 4.4.2) + middleman-cli (= 4.4.3) + middleman-core (= 4.4.3) middleman-autoprefixer (3.0.0) autoprefixer-rails (~> 10.0) middleman-core (>= 4.0.0) - middleman-cli (4.4.2) + middleman-cli (4.4.3) thor (>= 0.17.0, < 2.0) - middleman-core (4.4.2) - activesupport (>= 6.1, < 7.0) + middleman-core (4.4.3) + activesupport (>= 6.1, < 7.1) addressable (~> 2.4) backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13.0) + contracts (~> 0.13) dotenv erubis execjs (~> 2.0) @@ -63,7 +63,7 @@ GEM hamster (~> 3.0) hashie (~> 3.4) i18n (~> 1.6.0) - listen (~> 3.0.0) + listen (~> 3.0) memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel @@ -77,30 +77,30 @@ GEM middleman-sprockets (4.1.1) middleman-core (~> 4.0) sprockets (>= 3.0) - middleman-syntax (3.2.0) + middleman-syntax (3.3.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_portile2 (2.6.1) - minitest (5.14.4) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + mini_portile2 (2.8.0) + minitest (5.17.0) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - padrino-helpers (0.15.1) + padrino-helpers (0.15.2) i18n (>= 0.6.7, < 2) - padrino-support (= 0.15.1) + padrino-support (= 0.15.2) tilt (>= 1.4.1, < 3) - padrino-support (0.15.1) - parallel (1.21.0) + padrino-support (0.15.2) + parallel (1.22.1) parslet (2.0.0) - public_suffix (4.0.6) - racc (1.5.2) - rack (2.2.3) - rb-fsevent (0.11.0) + public_suffix (5.0.1) + racc (1.6.0) + rack (2.2.6.2) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.1) + redcarpet (3.6.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.30.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -112,17 +112,17 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - temple (0.8.2) - thor (1.1.0) - tilt (2.0.10) + temple (0.10.0) + thor (1.2.1) + tilt (2.0.11) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - webrick (1.7.0) - zeitwerk (2.5.1) + webrick (1.8.1) + zeitwerk (2.6.0) PLATFORMS ruby @@ -132,8 +132,8 @@ DEPENDENCIES middleman-autoprefixer (~> 3.0) middleman-sprockets (~> 4.1) middleman-syntax (~> 3.2) - nokogiri (~> 1.12.1) - redcarpet (~> 3.5.0) + nokogiri (~> 1.13.3) + redcarpet (~> 3.6.0) rouge (~> 3.21) sass webrick diff --git a/restful-notes-slate/slate/Vagrantfile b/restful-notes-slate/slate/Vagrantfile index 200839d..8a9981b 100644 --- a/restful-notes-slate/slate/Vagrantfile +++ b/restful-notes-slate/slate/Vagrantfile @@ -1,5 +1,5 @@ Vagrant.configure(2) do |config| - config.vm.box = "ubuntu/bionic64" + config.vm.box = "ubuntu/focal64" config.vm.network :forwarded_port, guest: 4567, host: 4567 config.vm.provider "virtualbox" do |vb| vb.memory = "2048" @@ -15,7 +15,7 @@ Vagrant.configure(2) do |config| sudo apt-get install -yq ruby ruby-dev sudo apt-get install -yq pkg-config build-essential nodejs git libxml2-dev libxslt-dev sudo apt-get autoremove -yq - gem install --no-ri --no-rdoc bundler + gem install --no-document bundler SHELL # add the local user git config to the vm @@ -28,7 +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)" + 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 diff --git a/restful-notes-slate/slate/slate.sh b/restful-notes-slate/slate/slate.sh index a3cc498..d6f1bd9 100755 --- a/restful-notes-slate/slate/slate.sh +++ b/restful-notes-slate/slate/slate.sh @@ -35,7 +35,7 @@ run_serve() { } run_build() { - bundle exec middleman build --clean + bundle exec middleman build --clean --watcher-disable } parse_args() { diff --git a/restful-notes-slate/slate/source/index.html.md b/restful-notes-slate/slate/source/index.html.md index db24627..71997cf 100644 --- a/restful-notes-slate/slate/source/index.html.md +++ b/restful-notes-slate/slate/source/index.html.md @@ -1,7 +1,7 @@ --- title: API Reference -language_tabs: # must be one of https://git.io/vQNgJ +language_tabs: # must be one of https://github.com/rouge-ruby/rouge/wiki/List-of-supported-languages-and-lexers - shell - ruby - python diff --git a/restful-notes-slate/slate/source/javascripts/app/_lang.js b/restful-notes-slate/slate/source/javascripts/app/_lang.js index cc5ac8b..c1bd6b2 100644 --- a/restful-notes-slate/slate/source/javascripts/app/_lang.js +++ b/restful-notes-slate/slate/source/javascripts/app/_lang.js @@ -143,7 +143,7 @@ under the License. languages = l; var presetLanguage = getLanguageFromQueryString(); - if (presetLanguage) { + if (presetLanguage && languages.includes(presetLanguage)) { // the language is in the URL, so use that language! activateLanguage(presetLanguage); diff --git a/restful-notes-slate/slate/source/stylesheets/_normalize.scss b/restful-notes-slate/slate/source/stylesheets/_normalize.scss index 46f646a..a38db2a 100644 --- a/restful-notes-slate/slate/source/stylesheets/_normalize.scss +++ b/restful-notes-slate/slate/source/stylesheets/_normalize.scss @@ -1,4 +1,4 @@ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! normalize.css v3.0.2 | MIT License | github.com/necolas/normalize.css */ /** * 1. Set default font family to sans-serif. diff --git a/restful-notes-slate/slate/source/stylesheets/screen.css.scss b/restful-notes-slate/slate/source/stylesheets/screen.css.scss index 70e3527..0ce124e 100644 --- a/restful-notes-slate/slate/source/stylesheets/screen.css.scss +++ b/restful-notes-slate/slate/source/stylesheets/screen.css.scss @@ -609,6 +609,10 @@ html, body { %right-col + %left-col { margin-top: $main-padding; } + + .highlight + p { + margin-top: 20px; + } } .highlight .c, .highlight .cm, .highlight .c1, .highlight .cs {