Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Update submodule #122

Merged
merged 2 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/application_controller_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion hyrax-webapp
Submodule hyrax-webapp updated 35 files
+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
4 changes: 2 additions & 2 deletions spec/hyku_knapsack/application_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions spec/models/concerns/account_settings_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading