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.

Sign up for GitHub

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

Jump to bottom

HYC-1740 - Hyrax 4 updates to overrides from other hydra gems (mostly) #1002

Merged
merged 20 commits into from
Sep 22, 2023
Merged

HYC-1740 - Hyrax 4 updates to overrides from other hydra gems (mostly) #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d4197b6
HYC-1731 - Remove access and use fields from solr document (#997)
bbpennel Sep 11, 2023
c42f886
HYC-1750 - Update department names (#999)
lfarrell Sep 19, 2023
5eea9dd
Remove mapping of affiliation to contributor (#1001)
lfarrell Sep 19, 2023
ddcdc95
Unescape filenames in content-disposition for rails 6 to avoid double…
bbpennel Sep 15, 2023
04e13d3
Replace user_roles.rb with override, add test for override method
bbpennel Sep 15, 2023
d8863a6
Convert processors/document.rb to an override and add test for overrides
bbpennel Sep 15, 2023
1e8eeca
Convert image.rb to a override file and remove the unused imagemagick…
bbpennel Sep 18, 2023
fd796f0
Delete roles overrides which were added to get i18n changes to show, …
bbpennel Sep 18, 2023
a79eabd
Convert geonames.rb to an override, add a test to verify the override
bbpennel Sep 18, 2023
f057eed
Convert uploaded_file_uploader.rb to override and add test
bbpennel Sep 19, 2023
d4b8680
Convert mini_magick/image/info.rb to an override, update to v4.12.0 a…
bbpennel Sep 19, 2023
4bdfca9
Clarifying override message
bbpennel Sep 15, 2023
2ec4212
Rubocop
bbpennel Sep 20, 2023
0cbd9e6
Delete commented code
bbpennel Sep 20, 2023
8cfb0d0
Add missing frozen_string_literals
bbpennel Sep 20, 2023
3febc8d
Add back in accidentally removed aria-label
bbpennel Sep 20, 2023
5f69c43
Remove override of manage users page. Move 'add new user' action to s…
bbpennel Sep 20, 2023
376da1b
Merge branch 'main' into hyc-1740-hydra2
bbpennel Sep 20, 2023
f0be4c6
Fix variable name. Allow geoname stubbing to match any username
bbpennel Sep 20, 2023
9576698
Update user_roles_spec.rb
bbpennel Sep 22, 2023
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
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ gem 'libv8', '~> 7.3'
gem 'sparql', '3.2.5'
gem 'linkeddata'
gem 'loofah', '~>2.19.1'
gem 'mini_magick', '~>4.11.0'
gem 'mini_magick', '~>4.12.0'
gem 'mini_racer', '~> 0.2.15', platforms: :ruby
gem 'nokogiri', '~>1.14.2'
gem 'omniauth', '~> 2.0'
Expand Down Expand Up @@ -90,6 +90,6 @@ group :test do
gem 'selenium-webdriver', '~> 4.8'
gem 'shoulda-matchers', '~> 5.1.0'
gem 'simplecov'
gem 'webdrivers'
gem 'webdrivers', '~> 5.3', require: false
gem 'webmock', '~> 3.14.0'
end
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ GEM
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mini_magick (4.11.0)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_racer (0.2.15)
libv8 (> 7.3)
Expand Down Expand Up @@ -1088,7 +1088,7 @@ DEPENDENCIES
linkeddata
listen (~> 3.7.0)
loofah (~> 2.19.1)
mini_magick (~> 4.11.0)
mini_magick (~> 4.12.0)
mini_racer (~> 0.2.15)
nokogiri (~> 1.14.2)
omniauth (~> 2.0)
Expand Down Expand Up @@ -1121,7 +1121,7 @@ DEPENDENCIES
twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
uglifier (~> 4.2.0)
web-console (~> 3.7.0)
webdrivers
webdrivers (~> 5.3)
webmock (~> 3.14.0)

RUBY VERSION
Expand Down
2 changes: 1 addition & 1 deletion app/forms/single_value_form.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
# [hyc-override] Overriding work form in hyrax gem to allow default fields to be singular
# [hyc-override] Subclassing hyrax work form to allow default fields to be singular
class SingleValueForm < Hyrax::Forms::WorkForm
extend Hyc::EdtfConvert

Expand Down
59 changes: 0 additions & 59 deletions app/lib/hydra/derivatives/processors/document.rb
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions app/lib/hydra/derivatives/processors/image.rb
View file
Open in desktop

This file was deleted.

Loading
Loading