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.8.1 - Slices, reuse terms and bugs fixes #631

Merged
merged 27 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1c01851
fix: home annotator block redirection to annotator page with empty te…
Bilelkihal May 24, 2024
1247c1a
Fix: Download button in summary export metadata (#628)
Bilelkihal May 27, 2024
8ddd2e1
Fix: the contexual json icon for to the concept adapt to the select …
SirineMhedhbi May 28, 2024
d13d0fe
feature: make view of clickable in summary page header (#643)
Bilelkihal May 30, 2024
e888c6f
feature: use the ontologies selector by name and acronym in edit grou…
Bilelkihal May 30, 2024
066607e
Fix: Reject the current ontology from appearing in the ontologies sel…
Bilelkihal May 31, 2024
41031fa
Feature: Make text area resisable in upload ontology and edit submiss…
Bilelkihal May 31, 2024
f95de69
Fix: The issue when the agent has no acronym (#645)
Bilelkihal May 31, 2024
04ddce0
fix: the concepts chips links redirecting to the wrong destination (…
Bilelkihal Jun 3, 2024
a49157f
Feature: Scroll to the selected term in the tree view component (#646)
Bilelkihal Jun 3, 2024
76f762e
fix: change local test "URL" to "URI" in check resolvability componen…
imadbourouche Jun 5, 2024
4cb9c98
Feature: Add content negotiation redirection tests (#622)
imadbourouche Jun 6, 2024
50bad5b
Feature: add Annotator UI tests (#627)
Bilelkihal Jun 6, 2024
f8d1176
Fix: multiple highlighted terms in concepts date view (#657)
Bilelkihal Jun 6, 2024
fac6747
Fix: concept details table layout max-with when long strings (#649)
Bilelkihal Jun 6, 2024
500635c
Feature: Clean no more used gems and code (#658)
syphax-bouazzouni Jun 7, 2024
08d5e05
handle the case reset_agents in edit submissions error state are alre…
syphax-bouazzouni Jun 7, 2024
4287541
Feature: Add issues and requests link to the footer and feedback form…
Bilelkihal Jun 9, 2024
19d59f9
fix: upload ontology on errors non returned values and no default val…
Bilelkihal Jun 11, 2024
3121de5
move pry gem outside development block in gemfile (#671)
syphax-bouazzouni Jun 12, 2024
ce19306
Feature: Add back slices (#598)
Bilelkihal Jun 12, 2024
5306a1a
fix docker compose to make local env dev work in port 3000
Bilelkihal Jun 20, 2024
c5bd46a
Fix: submissions properties selector labels and include ontologies pr…
syphax-bouazzouni Jun 21, 2024
78a7c23
make slices open in the same tab not in a new tab
Bilelkihal Jun 21, 2024
0d6dd48
put the ontoportal instances directly before the logos instead of a t…
Bilelkihal Jun 21, 2024
a332b32
Fix: Redirect to the login page when accessing private ontology while…
Bilelkihal Jun 21, 2024
2dba7fd
Feature: Distinguish reused terms in tree view (#650)
Bilelkihal Jun 21, 2024
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
163 changes: 101 additions & 62 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,93 +1,125 @@
source 'https://rubygems.org'

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

gem 'chart-js-rails'
# JavaScript bundling for Rails
gem 'jsbundling-rails'
gem 'sassc-rails' # sass-rails replacent
gem 'terser' # ugilifer replacent

# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
# gem 'duktape'
# Chart.js integration for Rails
gem 'chart-js-rails'

# SassC as a replacement for sass-rails
gem 'sassc-rails' # sass-rails replacement

# Terser JavaScript minifier as a replacement for Uglifier
gem 'terser' # uglifier replacement

# Bootstrap front-end framework
gem 'bootstrap', '~> 4.2.0'

# jQuery integration for Rails
gem 'jquery-rails'

# jQuery UI integration for Rails
gem 'jquery-ui-rails'

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
# The original asset pipeline for Rails
# [https://github.com/rails/sprockets-rails]
gem 'sprockets-rails'

# Use the Puma web server [https://github.com/puma/puma]
# Use the Puma web server
# [https://github.com/puma/puma]
gem 'puma', '~> 5.0'

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
# Use JavaScript with ESM import maps
# [https://github.com/rails/importmap-rails]
gem 'importmap-rails'

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
# Hotwire's SPA-like page accelerator
# [https://turbo.hotwired.dev]
gem 'turbo-rails'

# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
# Hotwire's modest JavaScript framework
# [https://stimulus.hotwired.dev]
gem 'stimulus-rails'

# Build JSON APIs with ease [https://github.com/rails/jbuilder]
# gem "jbuilder"
# Debugging tool
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem gem 'pry'
gem 'pry'

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
# Time zone info for Windows platforms
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

# Reduces boot times through caching; required in config/boot.rb

gem 'bootsnap', require: false

gem 'cube-ruby', require: 'cube'
# Memcached client for Ruby
gem 'dalli'
gem 'ffi', '~> 1.16.3'
gem 'flag-icons-rails', '~> 3.4'
gem 'flamegraph'

# GraphQL client for Ruby
gem 'graphql-client'

# Haml template engine for Ruby on Rails
gem 'haml', '~> 5.1'

# Internationalization (i18n)
gem 'i18n'
gem 'iconv'
gem 'inline_svg'
gem 'iso-639', '~> 0.3.6'
gem 'lookbook', '~> 1.5.5'
gem 'multi_json'
gem 'rails-i18n', '~> 7.0.0'

# MySQL database adapter
gem 'mysql2'

# JSON parsing libraries
gem 'multi_json'
gem 'oj'
gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git',
branch: 'development'
gem 'open_uri_redirections'
gem 'pry'
gem 'psych', '< 4'
gem 'rack-mini-profiler'
gem 'rails_autolink'
gem 'rails-i18n', '~> 7.0.0'
gem 'rdoc'

# Google reCAPTCHA integration
gem 'recaptcha', '~> 5.9.0'

# Simple HTTP and REST client for Ruby
gem 'rest-client'
gem 'stackprof', require: false
gem 'thin'
gem 'turnout'

# View components framework for Rails
gem 'lookbook', '~> 1.5.5'
gem 'view_component', '~> 2.72'

# Pagination library for Rails
gem 'will_paginate', '~> 3.0'

# Render SVG files in Rails views
gem 'inline_svg'

# ISO language codes and flags
gem 'flag-icons-rails', '~> 3.4'
gem 'iso-639', '~> 0.3.6'

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

# Ruby 2.7.8 pinned gems (to remove when migrating to Ruby >= 3.0)
gem 'ffi', '~> 1.16.3'
gem 'net-ftp', '~> 0.2.0', require: false
gem 'net-http', '~> 0.3.2'

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

group :staging, :production, :appliance do
# application monitoring
gem 'newrelic_rpm', '< 9.10.0'
# logs in json format, useful for shipping logs to logstash
# Application performance monitoring
gem 'newrelic_rpm'

# Error monitoring
gem 'bugsnag', '~> 6.26'

# Logs in JSON format, useful for shipping logs to logstash
# gem 'rackstash', git: 'https://github.com/planio-gmbh/rackstash.git'
# gem 'logstash-logger'
end
Expand All @@ -102,40 +134,47 @@ group :development do
gem 'capistrano-rails', '~> 1.4', require: false
gem 'capistrano-yarn', require: false
gem 'ed25519', '>= 1.2', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'html2haml'
gem 'listen'
# static code analysis

# Static code analysis
gem 'brakeman', require: false
gem 'rubocop', require: false
# gem 'i18n-debug'
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem

# Haml support for Rails
gem 'haml-rails'
gem 'html2haml'

# Debugging tools
gem 'debug', platforms: %i[mri mingw x64_mingw]

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

# Internationalization tasks
# gem 'i18n-debug'
gem 'i18n-tasks'
gem 'i18n-tasks-csv', '~> 1.1'
gem 'deepl-rb'
gem 'haml-rails'
gem 'letter_opener_web', '~> 2.0'
end

group :test, :development do
gem 'rspec-rails'
# Email preview in the browser
gem 'letter_opener_web', '~> 2.0'
end

group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
# System testing
# [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'

# WebDriver for system testing
gem 'selenium-webdriver'

# Code coverage generation
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', '~> 0.3.2'
# Mock HTTP requests in tests
gem 'webmock'

gem 'bugsnag', '~> 6.26'
# Testing framework for Rails
gem 'rspec-rails'
end
Loading
Loading