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 to master: Release 2.5.0 - New home, browse, and summary pages UI, in addition to integrating multi-provider authentication #338

Closed
wants to merge 8 commits into from
Closed
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
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,4 @@ docker-sync.yml
/config/credentials/development.key
/config/credentials/test.key
/config/credentials/staging.key
/config/credentials/appliance.key

/config/credentials/appliance.key
8 changes: 8 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,17 @@ gem 'thin'
gem 'view_component', '~> 2.72'
gem 'turnout'
gem 'will_paginate', '~> 3.0'
gem 'inline_svg'

gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development'

# Multi-Provider Authentication
gem 'omniauth'
gem "omniauth-rails_csrf_protection"
gem 'omniauth-github'
gem 'omniauth-google-oauth2'
gem 'omniauth-orcid'
gem 'omniauth-keycloak'

group :staging, :production, :appliance do
# application monitoring
Expand Down
123 changes: 99 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,15 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.4.1)
aes_key_wrap (1.1.0)
airbrussh (1.4.2)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
base64 (0.1.1)
bcrypt_pbkdf (1.1.0)
bindata (2.4.15)
bindex (0.8.1)
bootsnap (1.16.0)
msgpack (~> 1.2)
Expand Down Expand Up @@ -129,6 +132,8 @@ GEM
coderay (1.1.3)
concurrent-ruby (1.2.2)
crass (1.0.6)
css_parser (1.16.0)
addressable
cube-ruby (0.0.3)
daemons (1.4.1)
dalli (3.2.4)
Expand All @@ -143,28 +148,31 @@ GEM
erubi (1.12.0)
erubis (2.7.0)
eventmachine (1.2.7)
excon (0.99.0)
excon (0.102.0)
execjs (2.8.1)
faraday (2.0.1)
faraday-net_http (~> 2.0)
ruby2_keywords (>= 0.0.4)
faraday-excon (2.0.0)
excon (>= 0.27.4)
faraday (~> 2.0.0.alpha.pre.2)
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (2.1.0)
ffi (1.15.5)
flamegraph (0.9.5)
globalid (1.1.0)
activesupport (>= 5.0)
graphql (2.0.21)
globalid (1.2.0)
activesupport (>= 6.1)
graphql (2.1.0)
graphql-client (0.18.0)
activesupport (>= 3.0)
graphql
haml (5.2.2)
temple (>= 0.8.0)
tilt
hashie (5.0.0)
html2haml (2.3.0)
erubis (~> 2.7.0)
haml (>= 4.0)
Expand All @@ -179,6 +187,9 @@ GEM
importmap-rails (1.1.6)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
inline_svg (1.9.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.6.0)
irb (1.6.4)
reline (>= 0.3.0)
Expand All @@ -191,6 +202,14 @@ GEM
jsbundling-rails (1.1.1)
railties (>= 6.0.0)
json (2.6.3)
json-jwt (1.16.3)
activesupport (>= 4.2)
aes_key_wrap
bindata
faraday (~> 2.0)
faraday-follow_redirects
jwt (2.7.1)
language_server-protocol (3.17.0.3)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand All @@ -206,13 +225,15 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.4.1)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
minitest (5.18.0)
msgpack (1.7.0)
mime-types-data (3.2023.0808)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.19.0)
msgpack (1.7.2)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
mysql2 (0.5.3)
net-ftp (0.2.0)
Expand All @@ -233,11 +254,48 @@ GEM
net-protocol
net-ssh (7.1.0)
netrc (0.11.0)
newrelic_rpm (9.2.2)
newrelic_rpm (9.4.2)
nio4r (2.5.9)
nokogiri (1.14.3-x86_64-linux)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oj (3.14.3)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
oauth2 (1.4.11)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
oj (3.16.1)
omniauth (2.1.1)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
omniauth-github (2.0.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-google-oauth2 (1.0.1)
jwt (>= 2.0)
oauth2 (~> 1.1)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-keycloak (1.5.1)
faraday
json-jwt (> 1.13.0)
omniauth (>= 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-oauth2 (1.7.3)
oauth2 (>= 1.4, < 3)
omniauth (>= 1.9, < 3)
omniauth-orcid (2.1.1)
omniauth-oauth2 (~> 1.3)
ruby_dig (~> 0.0.2)
omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2)
omniauth (~> 2.0)
open_uri_redirections (0.2.1)
parallel (1.23.0)
parser (3.2.2.1)
Expand All @@ -247,15 +305,17 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
psych (3.3.4)
public_suffix (5.0.1)
puma (5.6.5)
public_suffix (5.0.3)
puma (5.6.7)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mini-profiler (3.1.0)
rack (>= 1.2.0)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.3)
Expand All @@ -275,8 +335,12 @@ 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)
rails-i18n (7.0.8)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
rails_autolink (1.1.8)
actionview (> 3.1)
activesupport (> 3.1)
Expand All @@ -296,8 +360,9 @@ GEM
rdoc (6.3.3)
recaptcha (5.9.0)
json
regexp_parser (2.8.0)
reline (0.3.3)
redcarpet (3.6.0)
regexp_parser (2.8.1)
reline (0.3.8)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand All @@ -321,8 +386,9 @@ GEM
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.0)
rubocop (1.50.2)
rspec-support (3.12.1)
rubocop (1.56.2)
base64 (~> 0.1.1)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
Expand All @@ -336,7 +402,8 @@ GEM
parser (>= 3.2.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_parser (3.20.0)
ruby_dig (0.0.2)
ruby_parser (3.20.3)
sexp_processor (~> 4.16)
rubyzip (2.3.2)
sassc (2.4.0)
Expand Down Expand Up @@ -365,7 +432,7 @@ GEM
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stackprof (0.2.25)
stimulus-rails (1.2.1)
stimulus-rails (1.2.2)
railties (>= 6.0.0)
temple (0.10.0)
terser (1.1.14)
Expand Down Expand Up @@ -418,6 +485,7 @@ GEM
zeitwerk (2.6.8)

PLATFORMS
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand All @@ -444,6 +512,7 @@ DEPENDENCIES
i18n
iconv
importmap-rails
inline_svg
jquery-rails
jquery-ui-rails
jsbundling-rails
Expand All @@ -454,6 +523,12 @@ DEPENDENCIES
net-http
newrelic_rpm
oj
omniauth
omniauth-github
omniauth-google-oauth2
omniauth-keycloak
omniauth-orcid
omniauth-rails_csrf_protection
ontologies_api_client!
open_uri_redirections
pry
Expand Down Expand Up @@ -484,4 +559,4 @@ DEPENDENCIES
will_paginate (~> 3.0)

BUNDLED WITH
2.3.23
2.1.4
3 changes: 3 additions & 0 deletions app/assets/images/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/check-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading