Skip to content

Commit

Permalink
Merge pull request #426 from sanger/develop
Browse files Browse the repository at this point in the history
Develop -> Master
  • Loading branch information
BenTopping authored Sep 18, 2023
2 parents 5512b24 + dd74e1f commit 2f6bc88
Show file tree
Hide file tree
Showing 63 changed files with 192 additions and 1,409 deletions.
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.0
2.0.0
25 changes: 4 additions & 21 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,10 @@ AllCops:
- bin/*
- vendor/**/*
Metrics/BlockLength:
IgnoredMethods:
- describe
- context
- background
- scenario
- namespace
- task
- included
- shared_context
- shared_examples
- state_machine
- configure
- draw
- feature
- subject
- let
- let!
- factory
- define
- shared_examples_for
- guard
Exclude:
- 'spec/**/*'
- 'config/environments/development.rb'
- 'lib/tasks/*'
Layout/LineLength:
Max: 120
Style/Documentation:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.7.4
ruby-3.2.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7
FROM ruby:3.2.0

RUN gem install bundler

Expand Down
17 changes: 2 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,17 @@

source 'https://rubygems.org'

gem 'mysql2', '~> 0.4'
gem 'rails', '~> 5.2'
gem 'mysql2'
gem 'rails', '~> 7.0.3'

# Rails dependencies
gem 'bootsnap'
gem 'puma'

# RabbitMQ client
gem 'sanger_warren'

gem 'mysql-binuuid-rails'

gem 'migration_comments'
gem 'rest-client'

# For JSON API support
gem 'jsonapi-rails', '~> 0.3'
gem 'jsonapi_suite', '~> 0.7'
gem 'jsonapi_swagger_helpers', '~> 0.6', require: false
# Used by swagger to generate docs
gem 'jsonapi_spec_helpers', require: false
gem 'kaminari' # Pagination. Used by jsonapi_suite
gem 'rack-cors', require: 'rack/cors'

gem 'oj'
gem 'rainbow'

Expand Down
Loading

0 comments on commit 2f6bc88

Please sign in to comment.