Skip to content

Commit

Permalink
Merge branch 'development' into feature/support-multilingual-part-2
Browse files Browse the repository at this point in the history
  • Loading branch information
syphax-bouazzouni committed Sep 3, 2023
2 parents 048b15c + 350ea19 commit ced6cfc
Show file tree
Hide file tree
Showing 557 changed files with 9,709 additions and 63,689 deletions.
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
13 changes: 10 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,16 @@ gem 'view_component', '~> 2.72'
gem 'turnout'
gem 'will_paginate', '~> 3.0'
gem 'inline_svg'

gem "lookbook", '~> 1.5.5'
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 Expand Up @@ -106,7 +113,7 @@ group :development do

# Use console on exceptions pages [https://github.com/rails/web-console]
gem 'web-console'
gem "lookbook", '~> 1.5.5'

end

group :test, :development do
Expand All @@ -123,4 +130,4 @@ end

gem "net-ftp", "~> 0.2.0", require: false
gem "net-http"
gem 'inline_svg'

Loading

0 comments on commit ced6cfc

Please sign in to comment.