Merge pull request #122 from scientist-softserv/update-submodule

⬆️ Update submodule
notch8 · Aug 16, 2024 · c30040f · c30040f
2 parents d956707 + a30b419
commit c30040f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/controllers/application_controller_decorator.rb b/app/controllers/application_controller_decorator.rb
@@ -82,7 +82,7 @@ def global_request_logging
 
   def set_sentry_context
     Sentry.set_user(id: session[:current_user_id]) # Set user context
-    Sentry.set_extras(params: params.to_unsafe_h, url: request.url)  # Set extra context
+    Sentry.set_extras(params: params.to_unsafe_h, url: request.url) # Set extra context
   end
 end
 

diff --git a/hyrax-webapp b/hyrax-webapp
diff --git a/spec/hyku_knapsack/application_spec.rb b/spec/hyku_knapsack/application_spec.rb
@@ -7,8 +7,8 @@
   let(:hyku_knapsack_root) { HykuKnapsack::Engine.root }
 
   describe '.theme_view_path_roots' do
-    it 'includes the Rails root and the Hyku Knapsack root' do
-      expect(described_class.theme_view_path_roots).to eq([rails_root.to_s, hyku_knapsack_root.to_s])
+    it 'includes the Hyku Knapsack root and the Rails root' do
+      expect(described_class.theme_view_path_roots).to eq([hyku_knapsack_root.to_s, rails_root.to_s])
     end
   end
 

diff --git a/spec/models/concerns/account_settings_spec.rb b/spec/models/concerns/account_settings_spec.rb
@@ -36,6 +36,7 @@
     end
 
     context 'when is_superadmin is false' do
+      # rubocop:disable RSpec/ExampleLength
       it 'returns all settings except private, disabled, and superadmin settings' do
         expect(Account.superadmin_settings.size).to eq 7
         expect(account.public_settings(is_superadmin: false).keys.sort).to eq %i[allow_downloads
@@ -56,6 +57,7 @@
                                                                                  ssl_configured]
         expect(account.public_settings(is_superadmin: false).size).to eq 16
       end
+      # rubocop:enable RSpec/ExampleLength
     end
   end
 end
+7 −1		.rubocop.yml
+37 −190		.rubocop_fixme.yml
+2 −7		.rubocop_todo.yml
+7 −4		Gemfile
+36 −24		Gemfile.lock
+3 −2		app/assets/stylesheets/hyku.scss
+34 −0		app/controllers/concerns/hyku/home_page_themes_behavior.rb
+1 −20		app/controllers/hyrax/contact_form_controller_decorator.rb
+2 −0		app/controllers/hyrax/dashboard/collections_controller_decorator.rb
+1 −19		app/controllers/hyrax/homepage_controller.rb
+1 −21		app/controllers/hyrax/pages_controller_decorator.rb
+4 −4		app/forms/hyku/forms/admin/appearance.rb
+3 −1		app/helpers/blacklight/catalog_helper_behavior_decorator.rb
+2 −0		app/listeners/hyrax_listener.rb
+1 −1		app/models/concerns/pdf_behavior.rb
+1 −1		app/models/featured_collection_list.rb
+10 −6		app/models/sushi.rb
+2 −0		app/models/sushi/item_report.rb
+4 −0		app/models/sushi/platform_report.rb
+2 −0		app/models/sushi/platform_usage_report.rb
+2 −2		app/models/sushi/report_list.rb
+1 −1		app/services/iiif_print/tenant_config.rb
+1 −1		app/services/import_counter_metrics.rb
+1 −1		config/application.rb
+2 −1		db/schema.rb
+1 −1		lib/tasks/tenantize_task.rake
+38 −0		spec/controllers/concerns/hyku/home_page_themes_behavior_spec.rb
+1 −1		spec/features/admin_set_form_participants_tab_spec.rb
+1 −1		spec/features/appearance_theme_spec.rb
+1 −1		spec/features/create_generic_work_spec.rb
+1 −1		spec/features/create_image_spec.rb
+1 −1		spec/features/work_editor_role_spec.rb
+1 −1		spec/models/sushi_spec.rb
+1 −1		spec/models/uploaded_file_spec.rb
+1 −1		spec/routing/featured_collections_route_spec.rb