Skip to content
Closed
2 changes: 1 addition & 1 deletion .github/workflows/build-solr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build:
uses: notch8/actions/.github/workflows/build.yaml@v1.0.4
uses: notch8/actions/.github/workflows/build.yaml@v1.0.8
secrets: inherit
with:
platforms: "linux/amd64"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

jobs:
build:
uses: notch8/actions/.github/workflows/build.yaml@v1.0.4
uses: notch8/actions/.github/workflows/build.yaml@v1.0.8
secrets: inherit
with:
platforms: "linux/amd64"
Expand All @@ -31,14 +31,14 @@ jobs:

test:
needs: build
uses: notch8/actions/.github/workflows/test.yaml@v1.0.4
uses: notch8/actions/.github/workflows/test.yaml@v1.0.8
with:
confdir: '/app/samvera/hyrax-webapp/solr/conf'
rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"

lint:
needs: build
uses: notch8/actions/.github/workflows/lint.yaml@v1.0.4
uses: notch8/actions/.github/workflows/lint.yaml@v1.0.8
with:
webTarget: hyku-web
workerTarget: hyku-worker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ on:

jobs:
deploy:
uses: notch8/actions/.github/workflows/deploy.yaml@v1.0.4
uses: notch8/actions/.github/workflows/deploy.yaml@v1.0.8
secrets: inherit
2 changes: 1 addition & 1 deletion hyrax-webapp
Submodule hyrax-webapp updated 57 files
+2 −2 Gemfile
+21 −22 Gemfile.lock
+5 −1 README.md
+ app/assets/images/logo-hyku.png
+0 −97 app/assets/stylesheets/hyku.scss
+80 −0 app/assets/stylesheets/hyku/splash.scss
+2 −2 app/assets/stylesheets/hyrax.scss
+21 −26 app/assets/stylesheets/themes/gallery_view.scss
+3 −2 app/controllers/catalog_controller.rb
+5 −0 app/controllers/identity_providers_controller.rb
+46 −0 app/helpers/identity_providers_helper.rb
+2 −1 app/indexers/concerns/hyku_indexing.rb
+10 −0 app/indexers/concerns/scrub_text.rb
+2 −3 app/indexers/hyku/indexers/file_set_indexer.rb
+124 −14 app/models/solr_document.rb
+22 −0 app/views/blacklight_dynamic_sitemap/sitemap/show.xml.builder
+11 −0 app/views/catalog/_document_gallery.html.erb
+3 −0 app/views/hyrax/base/_attribute_rows.html.erb
+101 −32 app/views/identity_providers/_form.html.erb
+4 −2 app/views/splash/index.html.erb
+16 −0 config/initializers/active_fedora_frozen_array_fix.rb
+1 −1 config/initializers/version.rb
+3 −2 config/locales/blacklight.en.yml
+24 −0 config/locales/de.yml
+1 −0 config/locales/devise.en.yml
+127 −117 config/locales/en.yml
+24 −0 config/locales/es.yml
+22 −21 config/locales/etd.en.yml
+24 −0 config/locales/fr.yml
+73 −76 config/locales/hyrax.en.yml
+24 −0 config/locales/it.yml
+45 −44 config/locales/oer.en.yml
+24 −0 config/locales/pt-BR.yml
+25 −25 config/locales/simple_form.en.yml
+24 −0 config/locales/zh.yml
+311 −0 config/metadata/basic_metadata.yaml
+144 −0 config/metadata/etd_resource.yaml
+3 −1 config/metadata/image_resource.yaml
+168 −0 config/metadata/oer_resource.yaml
+25 −1 config/metadata_profiles/m3_profile.yaml
+1 −0 config/routes.rb
+2 −0 docs/wiki/ActiveJob-with-tenants.md
+48 −0 docs/wiki/Creating-Custom-Themes.md
+47 −0 docs/wiki/Home.md
+1,329 −0 docs/wiki/Hyku-Test-Plan.md
+13 −0 docs/wiki/Multi-tenant-domain-model.md
+7 −0 docs/wiki/Run-rake-task-on-all-or-selected-tenants.md
+1 −0 docs/wiki/Set-email-addresses.md
+375 −0 docs/wiki/Updating-Hyku-6-with-Hyrax-5-Developer-Notes.md
+27 −0 docs/wiki/Using-account-switching-in-development.md
+148 −0 docs/wiki/Valkyrie-Migration.md
+15 −0 docs/wiki/Versioning---Draft.md
+31 −24 lib/blacklight_advanced_search/advanced_query_parser_decorator.rb
+62 −0 spec/fixtures/files/m3_profile.yaml
+53 −0 spec/models/solr_document_spec.rb
+102 −0 spec/requests/blacklight_dynamic_sitemap/sitemap_spec.rb
+195 −0 spec/views/identity_providers/_form.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,14 @@ def render_constraints_filters(params_or_search_state = search_state)
end
end

BlacklightAdvancedSearch::RenderConstraintsOverride.prepend(BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator)
if defined?(BlacklightAdvancedSearch::RenderConstraintsOverride)
# blacklight_advanced_search <= 7 (old hook point)
BlacklightAdvancedSearch::RenderConstraintsOverride.prepend(
BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator
)
elsif defined?(Blacklight::RenderConstraintsHelperBehavior)
# blacklight_advanced_search 8+ (RenderConstraintsOverride removed/renamed)
Blacklight::RenderConstraintsHelperBehavior.prepend(
BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator
)
end