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

Merge develop into main to push some new features #669

Open
wants to merge 861 commits into
base: main
Choose a base branch
from
Open

Merge develop into main to push some new features #669

wants to merge 861 commits into from

Conversation

afred
Copy link
Contributor

@afred afred commented Jul 15, 2022

No description provided.

@gitguardian
Copy link

gitguardian bot commented Sep 9, 2022

⚠️ GitGuardian has uncovered 3 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
- - SMTP credentials 3790c89 ops/alpha-deploy.tmpl.yaml View secret
8978162 Triggered Username Password 238a8b5 .env View secret
8978162 Triggered Username Password 29e5cae .env View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

kirkkwang and others added 19 commits August 29, 2023 11:44
This commit will replace all instances of
AdminSet.find_or_create_default_admin_set_id with
Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
because the former was deprecated.
This commit will fix various specs that were failing because of the Ruby
3.2.2 upgrade.  At this point there should only be 4 failures left.

```
879 examples, 4 failures, 38 pending

Failed examples:

rspec ./spec/models/bulkrax/pbcore_xml_entry_spec.rb:92
rspec ./spec/models/bulkrax/pbcore_xml_entry_spec.rb:87
rspec ./spec/models/bulkrax/pbcore_xml_entry_spec.rb:169
rspec ./spec/services/aapb/batch_ingest/csv_reader_spec.rb:30
```
This commit pulls in the changes for the PbcoreXMLEntry spec from
develop that passes.
In a previous commit where we removed support for rails 5.1 we forgot to copy over the view directory.
This work is still in progress. The valkyrie config file is commented out until we receive code for implementing adapters. We are using the object_factory config to utilize Valkyrie::ObjectFactory and lastly we added some changed to avoid errors when running an import.

Issue:
- scientist-softserv#97

Co-Authored-By: Kirk Wang <[email protected]>
Co-Authored-By: LaRita Robinson <[email protected]>
replaced .empty? to .blank?
conditional check for nil or blank to avoid nil:NilClass errors
added new annotationType as a method
adding new annotation as a method here too
adding ams1_legacy_metadata here too
Also,
* Adds conditionals to only include Bulkrax transaction steps if Bulkrax is enabled.
  * Use work_resource.create_with_bulkrax_behavior Container if enabled.
  * Use change_set.create_work if not enabled.
* Ignores local Sony Ci and Kubeconfig credential files based on default naming
  conventions and locations

Co-authored-by: Benjamin Kiah Stroud <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.