Skip to content

Commit

Permalink
Merge branch 'devel' into snyk-fix-1db3b8c408d19b744c9c86a9eda85920
Browse files Browse the repository at this point in the history
  • Loading branch information
khelwood authored Oct 9, 2023
2 parents 1cd211f + 2b0de82 commit 8b32cfd
Show file tree
Hide file tree
Showing 2 changed files with 170 additions and 152 deletions.
22 changes: 11 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
Loading

0 comments on commit 8b32cfd

Please sign in to comment.