.gitattributes: merge mikaela.github.io changes

.gitattributes

@@ -1,10 +1,24 @@
 # Linux line endings, force GH language detection
 * text=auto eol=lf linguist-detectable
 
+# Built-in diff patterns (disabled by default).
+*.css   diff=css
+*.html  diff=html
+*.php   diff=php
+*.{md,markdown} diff=markdown
+
 # These don't feel like mine
 .github/** text=auto -linguist-detectable
+css/** text=auto -linguist-detectable
+_data/** text=auto -linguist-detectable
 _includes/** text=auto -linguist-detectable
+_layouts/** text=auto -linguist-detectable
+_sass/** text=auto -linguist-detectable
 
 # Unnecessary for statistics
 Gemfile text linguist-vendored
 Gemfile.lock text linguist-generated
+
+# LFS
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text

Gemfile.lock

@@ -1,14 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.1.1)
+    bigdecimal (3.1.4)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -16,8 +22,11 @@ GEM
     colorator (1.1.0)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     dnsruby (1.70.0)
       simpleidn (~> 0.2.1)
+    drb (2.1.1)
+      ruby2_keywords
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -30,7 +39,7 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.16.2)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
     github-pages (228)
@@ -212,6 +221,7 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.20.0)
+    mutex_m (0.1.2)
     nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)