Merge branch 'main' into i867-make-imagemagick-limits-configurable

notch8 · Nov 7, 2024 · 1525be5 · 1525be5
2 parents 9315a82 + 2df048f
commit 1525be5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/config/initializers/pre_wings.rb b/config/initializers/pre_wings.rb
@@ -1,3 +1,14 @@
 Rails.application.config.to_prepare do
   WINGS_CONCERNS = [AdminSet, Collection, ConferenceItem, Dataset, Etd, ExamPaper, GenericWork, Image, JournalArticle, Oer, PublishedWork, Thesis].freeze
 end
+
+Rails.application.config.after_initialize do
+  Valkyrie::MetadataAdapter.register(
+    Freyja::MetadataAdapter.new,
+    :freyja
+  )
+  Valkyrie.config.metadata_adapter = :freyja
+
+  Hyrax.query_service.services[0].custom_queries.register_query_handler(Hyrax::CustomQueries::FindBySlug)
+  Hyrax.query_service.services[1].custom_queries.register_query_handler(Wings::CustomQueries::FindBySlug)
+end
diff --git a/hyrax-webapp b/hyrax-webapp
+0 −11		.github/CONTRIBUTING.md
+14 −9		.github/workflows/build-test-lint.yaml
+0 −11		CONTRIBUTING.md
+2 −2		Gemfile.lock
+5 −5		config/initializers/wings.rb
+6 −0		lib/reprocessor.rb