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

Adds support for encoded filters for API use #556

Merged
merged 8 commits into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.3
# Debian releases:
#
FROM ruby:3.0.2-slim-buster
FROM ruby:3.1.0-slim-bullseye
ARG app_name=baw-server
ARG app_user=baw_web
ARG version=
Expand Down
25 changes: 14 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ gem 'bootsnap', require: false
# standardised way to validate objects
gem 'dry-monads'
gem 'dry-struct'
gem 'dry-validation'
gem 'dry-transformer'
gem 'dry-validation'

# Async/promises/futures
gem 'concurrent-ruby', '~> 1', require: 'concurrent'
Expand All @@ -37,8 +37,8 @@ gem 'faraday'
gem 'faraday_middleware'

# api docs
gem 'rswag-api'
gem 'rswag-ui'
gem 'rswag-api', github: 'rswag/rswag', glob: 'rswag-api/*.gemspec'
gem 'rswag-ui', github: 'rswag/rswag', glob: 'rswag-ui/*.gemspec'

# uri parsing and generation
gem 'addressable'
Expand All @@ -50,16 +50,15 @@ gem 'deep_sort'

# DO NOT change rails version without also changing composite_primary_keys version
# https://github.com/composite-primary-keys/composite_primary_keys
RAILS_VERSION = '~> 6.1.4'
COMPOSITE_PRIMARY_KEYS_VERSION = '~> 13'
RAILS_VERSION = '~> 7.0.1'
COMPOSITE_PRIMARY_KEYS_VERSION = '~> 14'

group :server do
# RAILS

# -------------------------------------
gem 'rack-cors', '~> 1.1.1', require: 'rack/cors'
gem 'rails', RAILS_VERSION
gem 'responders', '~> 3.0.1'

# deal with chrome and same site cookies
gem 'rails_same_site_cookie'
Expand Down Expand Up @@ -107,7 +106,7 @@ group :server do
# https://github.com/plataformatec/devise/blob/master/CHANGELOG.md
# http://joanswork.com/devise-3-1-update/
gem 'cancancan', '> 3'
gem 'devise', '~> 4.7.0'
gem 'devise', '~> 4.8.1'
gem 'devise-i18n'
gem 'role_model', '~> 0.8.1'
# Use ActiveModel has_secure_password
Expand All @@ -124,7 +123,7 @@ group :server do

# extensions to arel https://github.com/Faveod/arel-extensions
# in particular, we use `cast`, and `coalesce`
gem 'arel_extensions'
gem 'arel_extensions', '>= 2.1.0'

# as the name says
gem 'composite_primary_keys', COMPOSITE_PRIMARY_KEYS_VERSION
Expand Down Expand Up @@ -183,7 +182,7 @@ group :workers, :server do

# logging
gem 'amazing_print'
gem 'rails_semantic_logger'
gem 'rails_semantic_logger', '>= 4.10.0'

# SETTINGS
# -------------------------------------
Expand All @@ -208,14 +207,18 @@ end
group :development do
# allow debugging
#gem 'debase', '>= 0.2.5.beta2'
gem 'debug', ">= 1.0.0"
gem 'debug', '>= 1.0.0'
gem 'readapt'
#gem 'ruby-debug-ide', '>= 0.7.2'
#gem 'traceroute'

# a ruby language server
gem 'solargraph'
gem 'solargraph-rails', '>= 0.2.2.pre.2'

# official ruby typing support
gem 'typeprof'

# needed by bundler/soalrgraph for language server?
gem 'actionview', RAILS_VERSION

Expand Down Expand Up @@ -285,7 +288,7 @@ group :test do
gem 'zonebie'

# api docs
gem 'rswag-specs'
gem 'rswag-specs', github: 'rswag/rswag', glob: 'rswag-specs/*.gemspec'

# old docs (deprecated)
gem 'rspec_api_documentation', '~> 4.8.0'
Expand Down
Loading