Skip to content
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.

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

Bump nokogiri from 1.10.10 to 1.15.5 #471

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,24 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.7.0)
extras (0.3.0)
forwardable-extended (~> 2.5)
fastimage (2.1.3)
ffi (1.13.1)
ffi (1.16.3)
forwardable-extended (2.6.0)
html-proofer (3.16.0)
html-proofer (4.4.3)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
parallel (~> 1.3)
nokogiri (~> 1.13)
parallel (~> 1.10)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -79,21 +80,21 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_magick (4.9.4)
mini_portile2 (2.4.0)
mini_portile2 (2.8.5)
minitest (5.14.2)
neat (3.0.0)
sass (~> 3.4)
thor (~> 0.19)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.19.2)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.24.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.4)
racc (1.7.3)
rack (2.2.8)
rainbow (3.0.0)
rainbow (3.1.1)
rake (12.3.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
Expand All @@ -113,11 +114,12 @@ GEM
rack (> 1, < 3)
thor (0.20.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
yell (2.2.2)
zeitwerk (2.6.12)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ _includes/svg/%.svg: assets/fontawesome/%.svg

test:
npm test
bundle exec htmlproofer _site --check-html --disable-external
bundle exec htmlproofer _site --disable-external=true
bundle exec scss-lint _sass

docker:
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h5 class="tagline">Brought to you by
and
<span class="tagline__em"><a href="https://www.oaklandca.gov/boards-and-commissions/public-ethics-commission">Oakland’s Public Ethics Commission</a></span>
</h5>
<h6 class="footer__stipulation">Campaign finance data provided by the City of Oakland Public Ethics Commission <a href="http://nf4.netfile.com/pub2/Default.aspx?aid=COAK">Public Portal for Campaign Finance and Lobbyist Disclosure</a>. Candidate and ballot measure information gathered from information provided to the Alameda County Registrar of Voters by the City of Oakland.</h6>
<h6 class="footer__stipulation">Campaign finance data provided by the City of Oakland Public Ethics Commission <a href="https://nf4.netfile.com/pub2/Default.aspx?aid=COAK">Public Portal for Campaign Finance and Lobbyist Disclosure</a>. Candidate and ballot measure information gathered from information provided to the Alameda County Registrar of Voters by the City of Oakland.</h6>
</div>
</div>
<div class="footer__col grid-col-4">
Expand Down
4 changes: 2 additions & 2 deletions _layouts/candidate.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ <h2>{{ candidate.name | smartify }}</h2>
</div>
{% endif %}
{% if candidate.website_url %}
<div class="candidate__link"><a href="{{ candidate.website_url }}">{% include svg-icon.html
<div class="candidate__link"><a href="{{ candidate.website_url | replace: 'http:', 'https:' }}">{% include svg-icon.html
icon="desktop-solid" %} {{ candidate.website_url }}</a></div>
{% endif %}
{% if candidate.twitter_url %}
Expand All @@ -76,7 +76,7 @@ <h2>{{ candidate.name | smartify }}</h2>
svg-icon.html icon="icon-instagram" %} {{ candidate.instagram_url }}</a></div>
{% endif %}
{% if candidate.votersedge_url %}
<div class="candidate__link"><a href="{{ candidate.votersedge_url }}" target="_blank">{% include
<div class="candidate__link"><a href="{{ candidate.votersedge_url | replace: 'http:', 'https:' }}" target="_blank">{% include
svg-icon.html icon="external-link-square-alt-solid" %} Voter’s Edge profile</a></div>
{% endif %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion assets/fontawesome/desktop-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/fontawesome/external-link-square-alt-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/fontawesome/icon-facebook-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/fontawesome/icon-instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/fontawesome/map-marked-alt-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/fontawesome/table-solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/fontawesome/twitter-brands.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading