diff --git a/Gemfile b/Gemfile index 8a7ae56..18b2c12 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ git_source(:github) do |repo_name| end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.1.0' +gem 'rails', '~> 6.1.7', '>= 6.1.7.5' gem 'mysql2', '~> 0.5.0' gem 'bootsnap' gem 'rails-controller-testing' @@ -19,7 +19,7 @@ gem 'uglifier' gem 'coffee-rails' gem 'launchy' # Use jquery as the JavaScript library -gem 'jquery-rails' +gem 'jquery-rails', '>= 4.5.0' gem 'jquery-ui-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' @@ -29,12 +29,12 @@ gem 'jquery-turbolinks' # bundle exec rake doc:rails generates the API under doc/api. # gem 'sdoc', '~> 0.4.0', group: :doc gem 'puma', '>= 5.6.7' -gem 'active_model_serializers' +gem 'active_model_serializers', '>= 0.10.13' gem 'bootstrap-sass' -gem 'font-awesome-rails' +gem 'font-awesome-rails', '>= 4.7.0.8' gem 'net-ldap' -gem 'kaminari' -gem 'exception_notification' +gem 'kaminari', '>= 1.2.2' +gem 'exception_notification', '>= 4.5.0' gem 'ejs', '~> 1.1', '>= 1.1.1' # Use ActiveModel has_secure_password @@ -55,13 +55,13 @@ gem 'pmb-client', '0.1.0', :github => 'sanger/pmb-client' ### group :development do # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console' + gem 'web-console', '>= 4.2.0' end group :test do gem 'capybara' gem 'selenium-webdriver', '<= 4.9.0', require: false - gem 'database_cleaner' + gem 'database_cleaner', '>= 2.0.2' gem 'rake' end @@ -70,9 +70,9 @@ group :development, :test do gem 'byebug' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' - gem 'factory_bot_rails' - gem 'rspec-rails' - gem 'with_model' + gem 'factory_bot_rails', '>= 6.2.0' + gem 'rspec-rails', '>= 5.0.2' + gem 'with_model', '>= 2.1.6' gem 'raml_ruby' gem 'listen' end diff --git a/Gemfile.lock b/Gemfile.lock index 1f775ce..5e3b5fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,65 +8,65 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.3.1) - actionpack (= 6.1.3.1) - activesupport (= 6.1.3.1) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.3.1) - actionpack (= 6.1.3.1) - activejob (= 6.1.3.1) - activerecord (= 6.1.3.1) - activestorage (= 6.1.3.1) - activesupport (= 6.1.3.1) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (>= 2.7.1) - actionmailer (6.1.3.1) - actionpack (= 6.1.3.1) - actionview (= 6.1.3.1) - activejob (= 6.1.3.1) - activesupport (= 6.1.3.1) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.3.1) - actionview (= 6.1.3.1) - activesupport (= 6.1.3.1) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.3.1) - actionpack (= 6.1.3.1) - activerecord (= 6.1.3.1) - activestorage (= 6.1.3.1) - activesupport (= 6.1.3.1) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) nokogiri (>= 1.8.5) - actionview (6.1.3.1) - activesupport (= 6.1.3.1) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_model_serializers (0.10.12) - actionpack (>= 4.1, < 6.2) - activemodel (>= 4.1, < 6.2) + active_model_serializers (0.10.13) + actionpack (>= 4.1, < 7.1) + activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.1.3.1) - activesupport (= 6.1.3.1) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (6.1.3.1) - activesupport (= 6.1.3.1) - activerecord (6.1.3.1) - activemodel (= 6.1.3.1) - activesupport (= 6.1.3.1) - activestorage (6.1.3.1) - actionpack (= 6.1.3.1) - activejob (= 6.1.3.1) - activerecord (= 6.1.3.1) - activesupport (= 6.1.3.1) - marcel (~> 1.0.0) - mini_mime (~> 1.0.2) - activesupport (6.1.3.1) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -101,25 +101,26 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.2.2) crass (1.0.6) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - diff-lcs (1.4.4) + date (3.3.3) + diff-lcs (1.5.0) ejs (1.1.1) - erubi (1.10.0) - exception_notification (4.4.3) - actionmailer (>= 4.0, < 7) - activesupport (>= 4.0, < 7) + erubi (1.12.0) + exception_notification (4.5.0) + actionmailer (>= 5.2, < 8) + activesupport (>= 5.2, < 8) execjs (2.7.0) - factory_bot (6.1.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) railties (>= 5.0.0) faraday (1.1.0) multipart-post (>= 1.2, < 3) @@ -127,13 +128,13 @@ GEM faraday_middleware (1.0.0) faraday (~> 1.0) ffi (1.15.0) - font-awesome-rails (4.7.0.7) - railties (>= 3.2, < 7) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.8.10) + font-awesome-rails (4.7.0.8) + railties (>= 3.2, < 8.0) + globalid (1.1.0) + activesupport (>= 5.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jquery-rails (4.4.0) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -152,80 +153,95 @@ GEM faraday_middleware (>= 0.9.0, < 1.2.0) rack (>= 0.2) jsonapi-renderer (0.2.2) - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) launchy (2.5.0) addressable (~> 2.7) libv8 (3.16.14.19) + libv8 (3.16.14.19-x86_64-linux) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) method_source (1.0.0) - mini_mime (1.0.3) - mini_portile2 (2.8.0) - minitest (5.14.4) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.19.0) msgpack (1.4.2) multipart-post (2.1.1) mysql2 (0.5.3) + net-imap (0.3.7) + date + net-protocol net-ldap (0.17.0) + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol nio4r (2.5.9) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) public_suffix (5.0.0) puma (6.3.1) nio4r (~> 2.0) - racc (1.6.1) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.1.3.1) - actioncable (= 6.1.3.1) - actionmailbox (= 6.1.3.1) - actionmailer (= 6.1.3.1) - actionpack (= 6.1.3.1) - actiontext (= 6.1.3.1) - actionview (= 6.1.3.1) - activejob (= 6.1.3.1) - activemodel (= 6.1.3.1) - activerecord (= 6.1.3.1) - activestorage (= 6.1.3.1) - activesupport (= 6.1.3.1) + racc (1.7.1) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) bundler (>= 1.15.0) - railties (= 6.1.3.1) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.3.1) - actionpack (= 6.1.3.1) - activesupport (= 6.1.3.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source - rake (>= 0.8.7) + rake (>= 12.2) thor (~> 1.0) - rake (13.0.3) + rake (13.0.6) raml_ruby (0.1.2) activesupport (>= 4.1) json-schema (~> 2.5) @@ -236,23 +252,23 @@ GEM ref (2.0.0) regexp_parser (2.1.1) rexml (3.2.6) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.1) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.10.2) + rspec-support (~> 3.12.0) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) ruby2_keywords (0.0.4) rubyzip (2.3.2) sass-rails (6.0.0) @@ -270,79 +286,81 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) spring (2.1.1) - sprockets (4.0.2) + sprockets (4.2.0) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (1.1.0) + thor (1.2.2) tilt (2.0.10) + timeout (0.4.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) uri_template (0.7.0) - web-console (4.1.0) + web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) websocket (1.2.9) - websocket-driver (0.7.3) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - with_model (2.1.5) + with_model (2.1.6) activerecord (>= 5.2) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.2) + zeitwerk (2.6.11) PLATFORMS ruby + x86_64-linux DEPENDENCIES - active_model_serializers + active_model_serializers (>= 0.10.13) bootsnap bootstrap-sass byebug capybara coffee-rails - database_cleaner + database_cleaner (>= 2.0.2) ejs (~> 1.1, >= 1.1.1) - exception_notification - factory_bot_rails - font-awesome-rails - jquery-rails + exception_notification (>= 4.5.0) + factory_bot_rails (>= 6.2.0) + font-awesome-rails (>= 4.7.0.8) + jquery-rails (>= 4.5.0) jquery-turbolinks jquery-ui-rails - kaminari + kaminari (>= 1.2.2) launchy listen mysql2 (~> 0.5.0) net-ldap pmb-client (= 0.1.0)! puma (>= 5.6.7) - rails (~> 6.1.0) + rails (~> 6.1.7, >= 6.1.7.5) rails-controller-testing rake raml_ruby - rspec-rails + rspec-rails (>= 5.0.2) sass-rails selenium-webdriver (<= 4.9.0) spring therubyracer turbolinks uglifier - web-console - with_model + web-console (>= 4.2.0) + with_model (>= 2.1.6) BUNDLED WITH 2.3.18