Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Commit

Permalink
remove uniqueness restriction from contributors and affiliations. upd…
Browse files Browse the repository at this point in the history 
…ated dependencies
  • Loading branch information
@briri
briri committed Jun 29, 2023
1 parent de2c035 commit 3be287b
Show file tree
Hide file tree
Showing 4 changed files with 803 additions and 743 deletions.
66 changes: 35 additions & 31 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,27 @@ GEM
rake (>= 10.4, < 14.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.766.0)
aws-sdk-core (3.173.0)
aws-partitions (1.782.0)
aws-sdk-core (3.176.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ssm (1.150.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-ssm (1.154.0)
aws-sdk-core (~> 3, >= 3.176.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.2)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.18)
bcrypt (3.1.19)
bibtex-ruby (6.0.0)
latex-decode (~> 0.0)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
brakeman (5.4.1)
brakeman (6.0.0)
builder (3.2.4)
byebug (11.1.3)
capistrano (3.17.2)
capistrano (3.17.3)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand All @@ -106,7 +106,7 @@ GEM
capistrano-rails (1.6.2)
capistrano (~> 3.1)
capistrano-bundler (>= 1.1, < 3)
capybara (3.39.1)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
Expand Down Expand Up @@ -150,7 +150,7 @@ GEM
activesupport (>= 5.0.0)
faker (3.2.0)
i18n (>= 1.8.11, < 2)
faraday (2.7.4)
faraday (2.7.8)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
Expand All @@ -168,14 +168,14 @@ GEM
httparty (0.21.0)
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.13.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.0)
jwt (2.7.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand All @@ -188,6 +188,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
latex-decode (0.4.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -208,14 +209,14 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
minitest (5.18.0)
mocha (2.0.2)
minitest (5.18.1)
mocha (2.0.4)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.1)
multi_xml (0.6.0)
mysql2 (0.5.5)
namae (1.1.1)
net-imap (0.3.4)
net-imap (0.3.6)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -229,9 +230,9 @@ GEM
net-ssh (7.1.0)
netrc (0.11.0)
nio4r (2.5.9)
nokogiri (1.15.1-arm64-darwin)
nokogiri (1.15.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.1-x86_64-linux)
nokogiri (1.15.2-x86_64-linux)
racc (~> 1.4)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
Expand All @@ -254,12 +255,13 @@ GEM
omniauth (>= 1.3.1)
orm_adapter (0.5.0)
parallel (1.23.0)
parser (3.2.2.1)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
psych (3.3.4)
public_suffix (5.0.1)
puma (3.12.6)
racc (1.6.2)
racc (1.7.1)
rack (2.2.7)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -289,8 +291,9 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.0.6.1)
actionpack (= 6.0.6.1)
activesupport (= 6.0.6.1)
Expand All @@ -303,7 +306,7 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
recaptcha (5.14.0)
regexp_parser (2.8.0)
regexp_parser (2.8.1)
responders (3.1.0)
actionpack (>= 5.2)
railties (>= 5.2)
Expand All @@ -329,20 +332,21 @@ GEM
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.12.0)
rubocop (1.51.0)
rspec-support (3.12.1)
rubocop (1.53.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.1)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.17.1)
rubocop-performance (1.18.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.13.0)
Expand All @@ -362,7 +366,7 @@ GEM
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
selenium-webdriver (4.9.1)
selenium-webdriver (4.10.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -393,8 +397,8 @@ GEM
text (1.3.1)
thor (1.2.2)
thread_safe (0.3.6)
tilt (2.1.0)
timeout (0.3.2)
tilt (2.2.0)
timeout (0.4.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
Expand All @@ -410,7 +414,7 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
version_gem (1.1.2)
version_gem (1.1.3)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.0)
Expand Down
2 changes: 1 addition & 1 deletion app/models/affiliation.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Affiliation < ApplicationRecord
has_and_belongs_to_many :fundings, class_name: 'Funding', join_table: 'fundings_affiliations'

# Validations
validates :name, presence: true, uniqueness: { case_sensitive: false }
validates :name, presence: true #, uniqueness: { case_sensitive: false }

before_validation :ensure_defaults

Expand Down
2 changes: 1 addition & 1 deletion app/models/contributor.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Contributor < ApplicationRecord

# Validations
validates :name, presence: true
validates :email, uniqueness: { case_sensitive: false, allow_nil: true, allow_blank: true }
# validates :email, uniqueness: { case_sensitive: false, allow_nil: true, allow_blank: true }

# Instance Methods
def name_first_last
Expand Down
Loading

0 comments on commit 3be287b

Please sign in to comment.