Merge branch 'main' into BGebken-patch-1

.ruby-version

@@ -1 +1 @@
-2.7.4
+3.1.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.6
+FROM ruby:3.1.3
 
 RUN apt-get update && \
   apt-get install --reinstall -y locales && \

Gemfile

@@ -1,4 +1,4 @@
-ruby '>= 2.6.6'
+ruby '>= 3.1.4'
 
 source "https://rubygems.org"
 
@@ -31,7 +31,6 @@ group :jekyll_plugins do
   gem 'jekyll-seo-tag'
   gem 'jekyll-autoprefixer'
   gem 'jekyll-include-cache'
-  gem "jekyll-assets", "~> 3.0", group: :jekyll_plugins
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -41,3 +40,5 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
 
 gem "html-proofer", "~> 3.18"
+
+gem "webrick", "~> 1.8"

Gemfile.lock

@@ -1,45 +1,37 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     autoprefixer-rails (9.8.6.5)
       execjs
     colorator (1.1.0)
-    concurrent-ruby (1.1.7)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.2.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
+      http_parser.rb (~> 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.2.0)
-    ffi (1.13.1)
+    execjs (2.9.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    html-proofer (3.18.5)
+    html-proofer (3.19.4)
       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)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    http_parser.rb (0.8.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (3.9.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
       kramdown (>= 1.17, < 3)
@@ -48,72 +40,52 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-assets (3.0.12)
-      activesupport (~> 5.0)
-      execjs (~> 2.7)
-      extras (~> 0.2)
-      fastimage (~> 2.0, >= 1.8)
-      jekyll (>= 3.5, < 4.0)
-      jekyll-sanity (~> 1.2)
-      liquid-tag-parser (~> 1.0)
-      nokogiri (~> 1.8)
-      pathutil (~> 0.16)
-      sprockets (>= 3.3, < 4.1.beta)
     jekyll-autoprefixer (1.0.2)
       autoprefixer-rails (~> 9.3)
-    jekyll-feed (0.15.1)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sanity (1.6.0)
-      jekyll (>= 3.1, < 5.0)
-      pathutil (~> 0.16)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.7.1)
+    jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    libv8 (8.4.255.0)
-    liquid (4.0.3)
-    liquid-tag-parser (1.9.0)
-      extras (~> 0.3)
-      liquid (>= 3.0, < 5.0)
-    listen (3.2.1)
+    libv8-node (18.16.0.0)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.1)
-    mini_racer (0.3.1)
-      libv8 (~> 8.4.255)
-    minitest (5.14.2)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.5)
+    mini_racer (0.8.0)
+      libv8-node (~> 18.16.0.0)
+    nokogiri (1.16.0)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogumbo (2.0.4)
-      nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.20.1)
+    parallel (1.24.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rainbow (3.0.0)
-    rb-fsevent (0.10.4)
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rack (2.2.8)
+    rainbow (3.1.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.24.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -123,11 +95,9 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    webrick (1.8.1)
     yell (2.2.2)
 
 PLATFORMS
@@ -136,7 +106,6 @@ PLATFORMS
 DEPENDENCIES
   html-proofer (~> 3.18)
   jekyll (~> 3.9)
-  jekyll-assets (~> 3.0)
   jekyll-autoprefixer
   jekyll-feed (~> 0.15)
   jekyll-include-cache
@@ -148,9 +117,10 @@ DEPENDENCIES
   mini_racer
   sprockets (~> 3.7)
   tzinfo-data
+  webrick (~> 1.8)
 
 RUBY VERSION
-   ruby 2.6.6p146
+   ruby 3.1.4p223
 
 BUNDLED WITH
-   1.17.3
+   2.5.1

_config.yml

@@ -181,35 +181,74 @@ exclude:
   - docker-compose.yml
   - Dockerfile
 
-assets:
-  sources:
-    - _assets/favicons
-    - _assets/images
-    - _assets/images/agencies
-    - _assets/images/banners
-    - _assets/images/fellows/2012
-    - _assets/images/fellows/2013
-    - _assets/images/fellows/2014
-    - _assets/images/fellows/2015
-    - _assets/images/fellows/2016
-    - _assets/images/fellows/2017
-    - _assets/images/fellows/2018
-    - _assets/images/fellows/2019
-    - _assets/images/fellows/2020
-    - _assets/images/fellows/2021
-    - _assets/images/fellows/2022
-    - _assets/images/fellows/2023
-    - _assets/images/press
-    - _assets/images/projects
-    - _assets/images/icons
-    - _assets/images/logo
-    - node_modules/uswds/dist/img
-    - node_modules/uswds/dist/js
-    - node_modules/uswds/dist/scss
+# assets:
+#   sources:
+#     - _assets/favicons
+#     - _assets/images
+#     - _assets/images/agencies
+#     - _assets/images/banners
+#     - _assets/images/fellows/2012
+#     - _assets/images/fellows/2013
+#     - _assets/images/fellows/2014
+#     - _assets/images/fellows/2015
+#     - _assets/images/fellows/2016
+#     - _assets/images/fellows/2017
+#     - _assets/images/fellows/2018
+#     - _assets/images/fellows/2019
+#     - _assets/images/fellows/2020
+#     - _assets/images/fellows/2021
+#     - _assets/images/fellows/2022
+#     - _assets/images/fellows/2023
+#     - _assets/images/press
+#     - _assets/images/projects
+#     - _assets/images/icons
+#     - _assets/images/logo
+#     - node_modules/uswds/dist/img
+#     - node_modules/uswds/dist/js
+#     - node_modules/uswds/dist/scss
+
+# autoprefixer:
+#   browsers:
+#     - last 2 versions
+#     - "> 2%"
+#     - IE 11
+#     - not dead
 
 autoprefixer:
   browsers:
-    - last 2 versions
     - "> 2%"
-    - IE 11
-    - not dead
+    - "last 2 versions"
+    - "IE 11"
+    - "not dead"
+
+sass:
+  source_dir: _sass
+  load_paths:
+    - assets/favicons
+    - assets/images
+    - assets/images/agencies
+    - assets/images/banners
+    - assets/images/fellows/2012
+    - assets/images/fellows/2013
+    - assets/images/fellows/2014
+    - assets/images/fellows/2015
+    - assets/images/fellows/2016
+    - assets/images/fellows/2017
+    - assets/images/fellows/2018
+    - assets/images/fellows/2019
+    - assets/images/fellows/2020
+    - assets/images/fellows/2021
+    - assets/images/fellows/2022
+    - assets/images/fellows/2023
+    - assets/images/press
+    - assets/images/projects
+    - assets/images/icons
+    - assets/images/logo
+    - node_modules/uswds/dist/
+    - node_modules/uswds/dist/img
+    - node_modules/uswds/dist/js
+    - node_modules/uswds/dist/scss
+  sourcemap: development
+  quiet_deps: true
+  style: compressed
+  verbose: true

_fellows/aamir-virani.md

@@ -1,7 +1,7 @@
 ---
 id: aamir-virani
 title: Aamir Virani
-image: aamir-virani-headshot.jpg
+image: /assets/images/fellows/2021/aamir-virani-headshot.jpg
 fellow_year: 2021
 project: ["nga-cto"]
 agency: ["NGA"]

_fellows/aaron-creel.md

@@ -1,7 +1,7 @@
 ---
 id: aaron-creel
 title: Aaron Creel
-image: aaron-creel-headshot.jpg
+image: /assets/images/fellows/2021/aaron-creel-headshot.jpg
 fellow_year: 2021
 project: ["hhs-oig"]
 agency: ["HHS"]

_fellows/aaron-snow.md

@@ -1,7 +1,7 @@
 ---
 id: aaron-snow
 title: Aaron Snow
-image: aaron-snow-headshot.png
+image: /assets/images/fellows/2013/aaron-snow-headshot.png
 fellow_year: 2013
 project: []
 agency: []

_fellows/abby-nydam.md

@@ -1,7 +1,7 @@
 ---
 id: abby-nydam
 title: Abby Nydam 
-image: abby-nydam-headshot.jpeg
+image: /assets/images/fellows/2022/abby-nydam-headshot.jpeg
 fellow_year: 2022
 project: []
 agency: ["EOP"]

_fellows/abrar-qureshi.md

@@ -1,7 +1,7 @@
 ---
 id: abrar-qureshi
 title: Abrar Qureshi
-image: abrar-qureshi-headshot.jpg
+image: /assets/images/fellows/2021/abrar-qureshi-headshot.jpg
 fellow_year: 2021
 project: ["usmc-logistics"]
 agency: ["USMC"]

_fellows/adam-becker.md

@@ -1,7 +1,7 @@
 ---
 id: adam-becker
 title: Adam Becker
-image: adam-becker-headshot.png
+image: /assets/images/fellows/2012/adam-becker-headshot.png
 fellow_year: 2012
 project: []
 agency: []

_fellows/adam-bellow.md

@@ -1,7 +1,7 @@
 ---
 id: adam-bellow
 title: Adam Bellow
-image: adam-bellow-headshot.jpg
+image: /assets/images/fellows/2016/adam-bellow-headshot.jpg
 fellow_year: 2016
 project: []
 agency: []

_fellows/adam-bonnifield.md

@@ -1,7 +1,7 @@
 ---
 id: adam-bonnifield
 title: Adam Bonnifield
-image: adam-bonnifield-headshot.jpg
+image: /assets/images/fellows/2015/adam-bonnifield-headshot.jpg
 fellow_year: 2015
 project: []
 agency: []