Skip to content

Commit 159ac79

Browse files
authored
Merge branch 'main' into dependabot/bundler/ruby-vips-2.2.5
2 parents d9ee111 + 92e21ea commit 159ac79

File tree

8 files changed

+10
-28
lines changed

8 files changed

+10
-28
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: 2 additions & 2 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)

_config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ collections:
4646
jobs:
4747
output: true
4848
permalink: /:collection/:name
49-
employees:
50-
output: true
51-
permalink: /:name
5249
partners:
5350
output: true
5451
permalink: /:collection/:name

_data/menu.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
link: /contribute/
1212
- title: nav.partners
1313
link: /partners/
14-
- title: nav.employees
15-
link: /employees/
1614
- title: nav.members
1715
link: /members/
1816
- title: nav.news

_pages/employees.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)