Skip to content

Commit a436ffc

Browse files
authored
Merge branch 'main' into dependabot/bundler/activesupport-8.0.3
2 parents 40b4646 + 9380266 commit a436ffc

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

.github/workflows/build-only.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
name: "Build website"
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
id: checkout
1616
# Use GitHub Node Action to install node_modules
17-
- uses: actions/setup-node@v4
17+
- uses: actions/setup-node@v6
1818
with:
1919
node-version: 16
2020
- run: npm install

.github/workflows/build-production.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
name: "Build and deploy website"
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
# Use GitHub Node Action to install node_modules
15-
- uses: actions/setup-node@v4
15+
- uses: actions/setup-node@v6
1616
with:
1717
node-version: 16
1818
- run: npm install

.github/workflows/build-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
name: "Build and deploy to GitHub Pages"
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
id: checkout
1515
# Use GitHub Node Action to install node_modules
16-
- uses: actions/setup-node@v4
16+
- uses: actions/setup-node@v6
1717
with:
1818
node-version: 16
1919
- run: npm install

.github/workflows/ort-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616

1717
# Steps represent a sequence of tasks that will be executed as part of the job
1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-java@v4
19+
- uses: actions/checkout@v5
20+
- uses: actions/setup-java@v5
2121
with:
2222
distribution: 'zulu' # See 'Supported distributions' for available options
2323
java-version: '17'

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ GEM
138138
minitest (5.25.5)
139139
namae (1.2.0)
140140
racc (~> 1.7)
141-
nokogiri (1.18.9)
141+
nokogiri (1.18.10)
142142
mini_portile2 (~> 2.8.2)
143143
racc (~> 1.4)
144-
nokogiri (1.18.9-x86_64-linux-gnu)
144+
nokogiri (1.18.10-x86_64-linux-gnu)
145145
racc (~> 1.4)
146146
pathutil (0.16.2)
147147
forwardable-extended (~> 2.6)
@@ -158,7 +158,7 @@ GEM
158158
chunky_png (~> 1.0)
159159
rqrcode_core (~> 1.0)
160160
rqrcode_core (1.2.0)
161-
ruby-vips (2.2.4)
161+
ruby-vips (2.2.5)
162162
ffi (~> 1.12)
163163
logger
164164
safe_yaml (1.0.5)

package-lock.json

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"@fullcalendar/common": "^5.11.4",
44
"@fullcalendar/icalendar": "^5.11.5",
55
"apexcharts": "^3.54.1",
6-
"bootstrap": "^5.3.7",
6+
"bootstrap": "^5.3.8",
77
"fork-awesome": "^1.2.0",
88
"fullcalendar": "^5.11.4",
99
"jquery": "^3.7.1",

0 commit comments

Comments
 (0)