Merge branch 'galaxyproject:main' into main

Author: PaulineSGN

.github/workflows/labeler.yml

@@ -9,7 +9,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v6
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: true

CONTRIBUTORS.yaml

@@ -677,6 +677,7 @@ Sch-Da:
       - uni-freiburg
       - deKCD
       - elixir-europe
+      - nfdi4culture
 
 dadrasarmin:
     name: Armin Dadras

GRANTS.yaml

@@ -203,6 +203,17 @@ nfdi4bioimage:
     url: https://nfdi4bioimage.de
     avatar: "/training-material/shared/images/nfdi4bioimage.jpeg"
 
+nfdi4culture:
+    name: "NFDI4Culture – Consortium for Research Data on Material and Immaterial Cultural Heritage"
+    short_name: "NFDI4Culture"
+    joined: 2025-08
+    avatar: "https://upload.wikimedia.org/wikipedia/commons/5/5d/NFDI4Culture_Logo.png"
+    github: false
+    url: https://nfdi4culture.de/
+    funder_name: DFG
+    funding_id: "441958017"
+    funding_database: dfg
+
 nfdi4plants:
     short_name: DataPLANT
     name: DataPLANT (NFDI4Plants)

Gemfile.lock

@@ -128,7 +128,7 @@ GEM
       ffi (~> 1.0)
     rdoc (6.9.1)
       psych (>= 4.0.0)
-    rexml (3.3.9)
+    rexml (3.4.2)
     rorvswild_theme_rdoc (0.2)
     rouge (4.1.3)
     ruby-rc4 (0.1.5)

_plugins/gtn.rb

@@ -365,6 +365,8 @@ def convert_to_material_list(site, materials)
 
           if m.key?('time')
             found['time'] = m['time']
+          else
+            found['time'] = nil
           end
           found
          elsif m.key?('type') && m['type'] == 'faq'