Skip to content

Commit

Permalink
Merge #439
Browse files Browse the repository at this point in the history 
439: Bump middleman from 4.2.1 to 4.3.1 r=segiddins a=dependabot[bot]

Bumps [middleman](https://github.com/middleman/middleman) from 4.2.1 to 4.3.1.
<details>
<summary>Changelog</summary>

*Sourced from [middleman's changelog](https://github.com/middleman/middleman/blob/v4.3.1/CHANGELOG.md).*

> # 4.3.1
> 
> * Fix sassc imports of gem files that expect old sass to be present.
> 
> # 4.3.0
> 
> * Only SassC from now on.
> * Fix regression (all the way back to v3) for Integer/Date keys in YAML. [#2238](https://github-redirect.dependabot.com/middleman/middleman/issues/2238)
> * Fix API to allow rack server according to docs (middleman/middlemanapp.com#794)
> * Require i18n ~> 0.8.0 to handle 0.7.0 security issue.
> * Allow Bundler 2
</details>
<details>
<summary>Commits</summary>

- [`4e078b3`](middleman/middleman@4e078b3) Fix tests
- [`8446772`](middleman/middleman@8446772) Bump gemfile
- [`cadcfed`](middleman/middleman@cadcfed) Prep 4.3.1
- [`2802534`](middleman/middleman@2802534) Import paths from libraries which expect ::Sass module to still exist. Fixes ...
- [`7064872`](middleman/middleman@7064872) Test Ruby 2.6.0
- [`defd945`](middleman/middleman@defd945) Use bundler 1.x for Travis
- [`102247a`](middleman/middleman@102247a) Bump minor version
- [`f68f6d3`](middleman/middleman@f68f6d3) Fix sass tests
- [`36326e4`](middleman/middleman@36326e4) Only libsass ([#2236](https://github-redirect.dependabot.com/middleman/middleman/issues/2236))
- [`38eecc0`](middleman/middleman@38eecc0) Bundler 2
- Additional commits viewable in [compare view](middleman/middleman@v4.2.1...v4.3.1)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=middleman&package-manager=bundler&previous-version=4.2.1&new-version=4.3.1)](https://dependabot.com/compatibility-score.html?dependency-name=middleman&package-manager=bundler&previous-version=4.2.1&new-version=4.3.1)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Co-authored-by: dependabot[bot] <[email protected]>
  • Loading branch information
@dependabot-support
bundlerbot[bot] and dependabot-support committed Jan 15, 2019
2 parents 615a28b + 47740b7 commit 0ec4edf
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby File.read(File.expand_path('../.ruby-version', __FILE__)).strip

gem 'octokit', '~> 4.13'
gem 'middleman', '~> 4.2'
gem 'middleman', '~> 4.3'
gem 'middleman-syntax'
gem 'middleman-blog'
gem 'middleman-compass'
Expand Down
53 changes: 26 additions & 27 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.0.6)
activesupport (5.0.7.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.4.0)
Expand Down Expand Up @@ -33,9 +33,9 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.4)
contracts (0.13.0)
dotenv (2.2.1)
dotenv (2.6.0)
erubis (2.7.0)
ethon (0.11.0)
ffi (>= 1.3.0)
Expand All @@ -45,7 +45,7 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fast_blank (1.0.0)
fastimage (2.1.0)
fastimage (2.1.5)
ffi (1.9.25)
gh (0.15.1)
addressable (~> 2.4.0)
Expand All @@ -59,11 +59,12 @@ GEM
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.5.6)
hashie (3.6.0)
highline (1.7.10)
hpricot (0.8.6)
htmlcompressor (0.2.0)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-middleman (3.1.2)
thor (>= 0.14, < 2.0)
json (2.1.0)
Expand All @@ -76,28 +77,26 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
memoist (0.16.0)
method_source (0.9.2)
middleman (4.2.1)
middleman (4.3.1)
coffee-script (~> 2.2)
compass-import-once (= 1.0.5)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-cli (= 4.2.1)
middleman-core (= 4.2.1)
sass (>= 3.4.0, < 4.0)
middleman-cli (= 4.3.1)
middleman-core (= 4.3.1)
middleman-blog (4.0.2)
addressable (~> 2.3)
middleman-core (~> 4.0)
tzinfo (>= 0.3.0)
middleman-cli (4.2.1)
middleman-cli (4.3.1)
thor (>= 0.17.0, < 2.0)
middleman-compass (4.0.1)
compass (>= 1.0.0, < 2.0.0)
middleman-core (>= 4.0.0)
middleman-core (4.2.1)
middleman-core (4.3.1)
activesupport (>= 4.2, < 5.1)
addressable (~> 2.3)
backports (~> 3.6)
bundler (~> 1.1)
bundler
contracts (~> 0.13.0)
dotenv
erubis
Expand All @@ -106,15 +105,15 @@ GEM
fastimage (~> 2.0)
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 0.7.0)
i18n (~> 0.9.0)
listen (~> 3.0.0)
memoist (~> 0.14)
padrino-helpers (~> 0.13.0)
parallel
rack (>= 1.4.5, < 3)
sass (>= 3.4)
sassc (~> 2.0)
servolux
tilt (~> 2.0)
tilt (~> 2.0.9)
uglifier (~> 3.0)
middleman-minify-html (3.4.1)
htmlcompressor (~> 0.2.0)
Expand All @@ -130,7 +129,7 @@ GEM
middleman-core (>= 3.2)
rouge (~> 2.0)
mini_portile2 (2.4.0)
minitest (5.10.3)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
mustache (1.0.5)
Expand All @@ -146,7 +145,7 @@ GEM
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.12.0)
parallel (1.12.1)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
Expand All @@ -159,9 +158,9 @@ GEM
websocket (~> 1.0)
rack (2.0.6)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdiscount (2.2.0.1)
ref (2.0.0)
ronn (0.7.3)
Expand All @@ -184,9 +183,9 @@ GEM
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
travis (1.8.9)
backports
faraday (~> 0.9)
Expand All @@ -198,7 +197,7 @@ GEM
typhoeus (~> 0.6, >= 0.6.8)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.3)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
Expand All @@ -213,7 +212,7 @@ DEPENDENCIES
haml (~> 5.0.4)
jquery-middleman
kramdown
middleman (~> 4.2)
middleman (~> 4.3)
middleman-blog
middleman-compass
middleman-minify-html
Expand Down

0 comments on commit 0ec4edf

Please sign in to comment.