Merge branch 'main' into agm-2025-update

MattyTheHacker · web-flow · commit ae6b5da67789 · 2025-09-01T16:46:54.000Z
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,16 +1,16 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
 version: 2
 updates:
-  - package-ecosystem: "docker" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "bundler"
+    directory: "/"
     schedule:
       interval: "daily"
 
-  - package-ecosystem: "bundler" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -28,7 +28,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.4.4
+3.4.5
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.4.4 AS base
+FROM ruby:3.4.5 AS base
 
 RUN bundle config set frozen 'true' && \
     bundle config set path '/vendor/bundle'
diff --git a/_includes/welcome_banner.html b/_includes/welcome_banner.html
@@ -1,3 +1,3 @@
 <div class="banner">
-  <p>Joining us in September? Watch our <a href="/welcome">welcome video</a> and <a href="/discord">meet everyone else over on Discord</a>!</p>
+  <p>Joining us in September? Check out our <a href="/calendar">events calendar</a> and <a href="/discord">meet everyone else over on Discord</a>!</p>
 </div>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -39,6 +39,7 @@
   {% include header.html %}
 
   <main>
+    {% include welcome_banner.html %}
     {{ content }}
   </main>
 
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -15,6 +15,7 @@
 <body>
   {% include header.html %}
   <main>
+    {% include welcome_banner.html %}
     <div class="post-header">
       {% if page.header-image %}
         <img class="post-header-image" src="{{ page.header-image | relative_url }}">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ruby:3.4.4 AS base`
	`1`	`+FROM ruby:3.4.5 AS base`
`2`	`2`
`3`	`3`	`RUN bundle config set frozen 'true' && \`
`4`	`4`	`bundle config set path '/vendor/bundle'`