Skip to content

Commit

Permalink
Merge pull request #41 from lifewatch-eric/ecoportal-ontoportal-reset
Browse files Browse the repository at this point in the history
Merge to master: AgroPortal release 2.8.0
  • Loading branch information
syphax-bouazzouni authored May 28, 2024
2 parents 0b60472 + 962d543 commit 5eb2f39
Show file tree
Hide file tree
Showing 484 changed files with 18,360 additions and 29,287 deletions.
37 changes: 28 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '7.0.3'
gem 'rails', '7.0.7'

gem 'jsbundling-rails'

gem 'chart-js-rails'
gem 'sassc-rails' #sass-rails replacent
gem 'terser' #ugilifer replacent

Expand All @@ -13,10 +13,9 @@ gem 'terser' #ugilifer replacent
# gem 'duktape'

gem 'bootstrap', '~> 4.2.0'
gem 'chart-js-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'select2-rails'



# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
Expand Down Expand Up @@ -54,9 +53,10 @@ gem 'flamegraph'
gem 'graphql-client'
gem 'haml', '~> 5.1'
gem 'i18n'
gem 'rails-i18n', '~> 7.0.0'
gem 'iconv'
gem 'multi_json'
gem 'mysql2', '0.5.3'
gem 'mysql2'
gem 'oj'
gem 'open_uri_redirections'
gem 'pry'
Expand All @@ -73,9 +73,17 @@ gem 'turnout'
gem 'will_paginate', '~> 3.0'
gem 'inline_svg'
gem "lookbook", '~> 1.5.5'
gem 'ffi', '~> 1.15.5'
gem "flag-icons-rails", "~> 3.4"
gem "iso-639", "~> 0.3.6"
gem 'ontologies_api_client', git: 'https://github.com/lifewatch-eric/ontologies_api_ruby_client.git', branch: 'master'

# 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 All @@ -86,7 +94,7 @@ group :staging, :production, :appliance do
end

group :development do
# Capistrano Deployment
# Capistrano Deployment
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'capistrano', '~> 3.11', require: false
gem 'capistrano-bundler', require: false
Expand All @@ -106,7 +114,12 @@ group :development do

# Use console on exceptions pages [https://github.com/rails/web-console]
gem 'web-console'
gem 'i18n-tasks'
gem 'i18n-tasks-csv', '~> 1.1'

gem 'deepl-rb'
gem 'letter_opener_web', '~> 2.0'
gem 'haml-rails'
end

group :test, :development do
Expand All @@ -117,11 +130,17 @@ group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'
gem 'selenium-webdriver'
gem 'webdrivers'
gem 'simplecov', require: false
gem 'simplecov-cobertura' # for codecov.io
#gem 'webdrivers'
gem 'webmock'
end


gem "net-ftp", "~> 0.2.0", require: false
gem "net-http"
gem "net-http", "~> 0.3.2"
gem 'openid_connect', '~> 2.2.0'



gem "bugsnag", "~> 6.26"
Loading

0 comments on commit 5eb2f39

Please sign in to comment.