Skip to content

Merge from upstream to development #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
eynzhang wants to merge 167 commits into
base: development
Choose a base branch
from
Open

Merge from upstream to development #25

eynzhang wants to merge 167 commits into from

Conversation

@eynzhang
Copy link

@eynzhang eynzhang commented Oct 27, 2020

No description provided.

lord and others added 30 commits October 20, 2019 19:49
@lord
Update issue template to direct users to changelog instead of git com…
ab0b3e6 
…mits
@greysteil @lord
[Security] Bump nokogiri from 1.8.2 to 1.8.5 (#1026)
1d6404a 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.2 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.8.2...v1.8.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@coliff @lord
Update link in .editorconfig to https (#1049)
99cdc40
@jeffstieler @lord
Fix lowercase "c" in "WooCommerce". (#1043)
c8b7355
@greysteil @lord
[Security] Bump ffi from 1.9.17 to 1.9.25 (#1017)
16d2b1e 
Bumps [ffi](https://github.com/ffi/ffi) from 1.9.17 to 1.9.25. **This update includes security fixes.**
- [Release notes](https://github.com/ffi/ffi/releases)
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md)
- [Commits](ffi/ffi@1.9.17...1.9.25)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@greysteil @lord
[Security] Bump rack from 2.0.5 to 2.0.6 (#1038)
3dfde2c 
Bumps [rack](https://github.com/rack/rack) from 2.0.5 to 2.0.6. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](rack/rack@2.0.5...2.0.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@lord
Bundle update; upgrade middleman, add sass gem
98951d5 
Patch taken from #1092, thanks jakemack
@lord
Update to bundler 2.0 in travis.yml
0b195a9
@dan-os @lord
Update issue templates
f81909e
@thenengah @lord
updated config.rb to activate asset_hash (#1076)
36b7e44
@danielkorbit @lord
change example link correctly (#1130)
e7eb647
@lord
Change default value of base fork in PR template (#1137)
151c303
@gawry @lord
Updated README.md from lord/slate to slatedocs/slate (#1140)
894534b
@MasterOdin @lord
Update url for travis badge
b3a4f1f
@MasterOdin @lord
[Security] Upgrade nokogiri to 1.10.4 (#1150)
bc5b66f
@MasterOdin @lord
Cut version 2.4.0
2019c63
@BigBlueHat
Use the full Apache License 2.0 text in LICENSE
c51fa22 
Per the Apache Software Foundation guidelines for applying the Apache License 2.0:
https://www.apache.org/foundation/license-faq.html#Apply-My-Software

> You should include a copy of the Apache License, typically in a file called LICENSE, in your work, and consider also including a NOTICE file.
@amayer5125
Update GitHub Links on example generated site (#1196)
274949c
@MikeRalphson
Merge branch 'master' into patch-2
7c35df8
@MikeRalphson
Merge pull request #1186 from BigBlueHat/patch-2
e3d77f1 
Use the full Apache License 2.0 text in LICENSE
@bradthurber @MasterOdin
Update Vagrantfile to Ubuntu 18.04 (#1158)
1be12d2 
* Slate 2.4 breaks vagrant

* Update Vagrantfile

* Update Vagrantfile
@MasterOdin
Ignore generated log file from running Vagrant
73e45c5
@MasterOdin
Update tested versions of ruby on Travis (#1160)
391f3d8
@MasterOdin
Fully parse arguments first in deploy (#1153)
252a48b 
* Do not build sources when using --help

* Use variables for build/push if statements

* fix error message
@lord @MasterOdin
List maintainers in README (#1164)
a4854b0
@fernandoaguilar @MasterOdin
Install nodejs in Vagrantfile (#1202)
375af3c 
Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
@redhatxl @MasterOdin
add Dockerfile (#1124)
d11eb1f 
* add Dockerfile

add Dockerfile

* Update Dockerfile

Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
@MasterOdin
add instructions to running docker to README
7cecafe 
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
@MasterOdin
Remove line in README about Docker wiki
a8eb386 
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
@MasterOdin
update middleman dep to 4.3.6
f31c738 
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
dependabot bot and others added 18 commits February 4, 2022 23:06
@dependabot
Bump rouge from 3.27.0 to 3.28.0 (#1574)
9c98b1f 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@MasterOdin
Add support to build multi-arch docker images (#1587)
0af1c01
@MasterOdin
Drop support for Ruby 2.5 (#1588)
6208332
@dependabot
Bump nokogiri from 1.12.5 to 1.13.3 (#1585)
5418779 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump nokogiri from 1.13.3 to 1.13.4 (#1604)
b7a5658 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@aemengo
Remove VOLUME declaration from Dockerfile (#1607)
dc4ce03
@MasterOdin
Bump version to 2.13.0 (#1606)
e352596
@MasterOdin
Remove extra * from changelog date
6168cd4
@MasterOdin
Fix version ranges for rouge and nokogiri in 2.13.0 release
848d9ee
@dependabot
Bump nokogiri from 1.13.4 to 1.13.5 (#1612)
63eee65 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Cyb0rk
Fix Vagrantfile gem install for ruby >= 2.6 (#1618)
d8225be
@dependabot
Bump rouge from 3.28.0 to 3.29.0 (#1621)
0ef68b7 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump nokogiri from 1.13.5 to 1.13.6 (#1614)
6115480 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@judge2020
Expand deprecated git.io links to full url (#1611)
22ddbe3
@dependabot
Bump nokogiri from 1.13.6 to 1.13.7 (#1639)
fa73871 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump nokogiri from 1.13.7 to 1.13.8 (#1643)
009bd06 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump rouge from 3.29.0 to 3.30.0 (#1646)
eb32e1b 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump middleman-syntax from 3.2.0 to 3.3.0 (#1648)
9ab7838 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
anapsix and others added 11 commits September 13, 2022 20:14
@anapsix @MasterOdin
Disable file watcher in run_build() for the sake of qemu on arm64 (#1658
9f927c1 
)
@dependabot
Bump nokogiri from 1.13.8 to 1.13.9 (#1676)
10d4c77 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump redcarpet from 3.5.1 to 3.6.0 (#1715)
2a2e60f 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump webrick from 1.7.0 to 1.8.1 (#1713)
a43bf2a 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @MasterOdin
Bump middleman from 4.4.2 to 4.4.3 (#1682)
bc3f155 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
@tlhunter
Add margin to paragraph following code-block on phones (#1637)
2f73193
@MasterOdin
Bump version to 2.13.1 (#1661)
fc2e92b
@realityking
Add ruby 3.2 to test suite (#1755)
ca630ef
@MasterOdin
Remove updating gem from CI (#1787)
cbdc43c
@realityking @MasterOdin
Handle incorrectly set language parameter (#1756)
50239a7 
Co-authored-by: Matthew Peveler <matt.peveler@gmail.com>
@jaredmoody
Update github actions/checkout and actions/cache to v3 (#1727)
97c8dd4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.