Skip to content

Commit

Permalink
Merge pull request #12 from fatboypunk/dependabot/bundler/middleman-4…
Browse files Browse the repository at this point in the history
….3.1

Bump middleman from 4.2.1 to 4.3.1
  • Loading branch information
fatboypunk authored Jan 15, 2019
2 parents d0b1561 + ff1b7da commit 2ffe537
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'bourbon'
gem 'neat'
gem 'bitters'
gem 'leaflet-rails'
gem 'middleman', '~> 4.2'
gem 'middleman', '~> 4.3'
gem 'middleman-autoprefixer', '~> 2.7'
gem 'middleman-gh-pages'
gem 'middleman-livereload'
Expand Down
52 changes: 28 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,18 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
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)
crass (1.0.4)
dotenv (2.5.0)
dotenv (2.6.0)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.2.7)
execjs (2.7.0)
fast_blank (1.0.0)
fastimage (2.1.4)
fastimage (2.1.5)
ffi (1.9.25)
globalid (0.4.1)
activesupport (>= 4.2.0)
Expand All @@ -80,7 +78,8 @@ GEM
concurrent-ruby (~> 1.0)
hashie (3.6.0)
http_parser.rb (0.6.0)
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
kramdown (1.17.0)
leaflet-rails (1.3.1)
rails (>= 4.2.0)
Expand All @@ -94,24 +93,22 @@ GEM
mini_mime (>= 0.1.1)
memoist (0.16.0)
method_source (0.9.0)
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-autoprefixer (2.9.0)
autoprefixer-rails (~> 8.0)
middleman-core (>= 3.3.3)
middleman-cli (4.2.1)
middleman-cli (4.3.1)
thor (>= 0.17.0, < 2.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 @@ -120,15 +117,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-gh-pages (0.4.0)
rake (> 0.9.3)
Expand Down Expand Up @@ -156,7 +153,7 @@ GEM
activesupport (>= 3.1)
parallel (1.12.1)
public_suffix (3.0.3)
rack (2.0.5)
rack (2.0.6)
rack-livereload (0.3.17)
rack
rack-test (0.6.3)
Expand Down Expand Up @@ -186,9 +183,16 @@ GEM
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
sass (3.4.25)
rb-inotify (0.10.0)
ffi (~> 1.0)
sass (3.7.3)
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.0.0)
ffi (~> 1.9.6)
rake
servolux (0.13.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
Expand All @@ -198,9 +202,9 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.0)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (3.2.0)
Expand All @@ -216,7 +220,7 @@ DEPENDENCIES
bitters
bourbon
leaflet-rails
middleman (~> 4.2)
middleman (~> 4.3)
middleman-autoprefixer (~> 2.7)
middleman-gh-pages
middleman-livereload
Expand Down

0 comments on commit 2ffe537

Please sign in to comment.