Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

RDMS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

87e68ce2

Commit 87e68ce2 authored 2 years ago by Anusha Ranganathan

Downloads
- Plain Diff

Merge branch 'feature/s3_storage' of gitlab rdms into feature/s3_storage

parents 6622139c 5c7148a1

No related branches found

No related tags found

Loading

Pipeline #4698 failed 2 years ago

Stage: build

Stage: test

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

hyrax/app/actors/hyrax/actors/file_actor.rb 79 additions, 1 deletion

hyrax/app/actors/hyrax/actors/file_actor.rb
hyrax/app/jobs/characterize_job.rb 0 additions, 149 deletions

hyrax/app/jobs/characterize_job.rb
hyrax/app/models/hyrax/uploaded_file.rb 48 additions, 0 deletions

hyrax/app/models/hyrax/uploaded_file.rb
hyrax/app/services/prepare_csv_from_crc_folder.rb 30 additions, 20 deletions

hyrax/app/services/prepare_csv_from_crc_folder.rb
hyrax/app/views/hyrax/file_sets/media_display/_image.html.erb 9 additions, 9 deletions

...x/app/views/hyrax/file_sets/media_display/_image.html.erb
hyrax/db/migrate/20220916103404_add_characterization_data_to_uploaded_files.rb 5 additions, 0 deletions

...0916103404_add_characterization_data_to_uploaded_files.rb
hyrax/db/schema.rb 2 additions, 1 deletion

hyrax/db/schema.rb

with 173 additions and 180 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment