Skip to content

Commit

Permalink
Merge branch 'development' into fix/synchronize-groups-to-slices-admi…
Browse files Browse the repository at this point in the history
…n-page
  • Loading branch information
syphax-bouazzouni committed Jan 2, 2024
2 parents 41f4109 + d6d4688 commit 2ee7125
Show file tree
Hide file tree
Showing 81 changed files with 1,327 additions and 4,874 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 12 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
chart-js-rails (0.1.7)
railties (> 3.1)
coderay (1.1.3)
concurrent-ruby (1.2.2)
crass (1.0.6)
Expand All @@ -146,7 +144,7 @@ GEM
daemons (1.4.1)
dalli (3.2.6)
date (3.3.4)
debug (1.9.0)
debug (1.9.1)
irb (~> 1.10)
reline (>= 0.3.8)
deepl-rb (2.5.3)
Expand Down Expand Up @@ -176,7 +174,7 @@ GEM
flamegraph (0.9.5)
globalid (1.2.1)
activesupport (>= 6.1)
graphql (2.2.0)
graphql (2.2.3)
racc (~> 1.4)
graphql-client (0.18.0)
activesupport (>= 3.0)
Expand Down Expand Up @@ -218,7 +216,7 @@ GEM
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.7.1)
irb (1.10.1)
irb (1.11.0)
rdoc
reline (>= 0.3.8)
iso-639 (0.3.6)
Expand All @@ -231,7 +229,7 @@ GEM
jsbundling-rails (1.2.1)
railties (>= 6.0.0)
json (2.7.1)
json-jwt (1.16.3)
json-jwt (1.16.4)
activesupport (>= 4.2)
aes_key_wrap
bindata
Expand Down Expand Up @@ -285,13 +283,14 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
mutex_m (0.2.0)
mysql2 (0.5.5)
net-ftp (0.2.0)
net-protocol
time
net-http (0.4.0)
uri
net-imap (0.4.8)
net-imap (0.4.9)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -302,7 +301,7 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.4.0)
net-protocol
net-ssh (7.2.0)
net-ssh (7.2.1)
netrc (0.11.0)
newrelic_rpm (9.6.0)
base64
Expand All @@ -319,7 +318,7 @@ GEM
rack (>= 1.2, < 4)
oj (3.16.3)
bigdecimal (>= 3.0)
omniauth (2.1.1)
omniauth (2.1.2)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
Expand Down Expand Up @@ -364,7 +363,8 @@ GEM
rack (>= 0.4)
rack-mini-profiler (3.3.0)
rack (>= 1.2.0)
rack-protection (3.1.0)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
Expand Down Expand Up @@ -468,7 +468,6 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
select2-rails (4.0.13)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand All @@ -492,7 +491,8 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sshkit (1.21.6)
sshkit (1.21.7)
mutex_m
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stackprof (0.2.25)
Expand Down Expand Up @@ -561,7 +561,6 @@ DEPENDENCIES
capistrano-rails (~> 1.4)
capistrano-yarn
capybara
chart-js-rails
cube-ruby
dalli
debug
Expand Down Expand Up @@ -611,7 +610,6 @@ DEPENDENCIES
rspec-rails
rubocop
sassc-rails
select2-rails
selenium-webdriver
simplecov
simplecov-cobertura
Expand Down
5 changes: 0 additions & 5 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,16 @@
//= require bioportal
//= require admin/licenses
//= require bp_ajax_controller
//= require bp_reviews
//= require bp_notes
//= require bp_ontolobridge
//= require bp_form_complete
//= require bp_analytics
//= require bp_search
//= require bp_mappings
//= require bp_admin
//= require bp_recommender
//= require bp_property_tree
//= require concepts
//= require home
//= require_tree ./helpers
//= require_tree ./components
//= require ontologies
//= require projects
//= require application_esbuild
customElements.define('data-table-loader', DataTableLoader );
Expand Down
Loading

0 comments on commit 2ee7125

Please sign in to comment.