chore: rebase on upstream changes#4

Draft

tborg wants to merge 35 commits intomasterfrom

tborg.rebase-upstream

Commits on Jan 3, 2021

Commits on Mar 24, 2021

Commits on Apr 26, 2021

Bump puma from 4.3.3 to 4.3.5 in /spec/integration/rails_6.0.2.1 (#808)
dependabot[bot]
authored
Bump puma from 4.3.3 to 4.3.5 in /spec/integration/rails_5.2.4.1 (#809)
dependabot[bot]
authored
Bump websocket-extensions in /spec/integration/rails_5.2.4.1 (#812)
dependabot[bot]
authored
Bump websocket-extensions in /spec/integration/rails_6.0.2.1 (#813)
dependabot[bot]
authored
Bump rack from 2.1.2 to 2.2.3 in /spec/integration/rails_6.0.2.1 (#819)
dependabot[bot]
authored
Bump rack from 2.1.2 to 2.2.3 in /spec/integration/rails_5.2.4.1 (#820)
dependabot[bot]
authored

Commits on May 10, 2021

Allow `get_loaded_model` to succeed when `$LOAD_PATH` contains non-string values (#848)
Hamms
authored

Commits on Jun 12, 2021

fix ci: conflicts with removed gems (#865)
ocarta-l
authored

Commits on Jan 31, 2022

Fix: use klass.table_name instead of guessing from associated models (#847)
ocarta-l
authored

Commits on Feb 1, 2022

Fix undefined method error when geometric columns have no `srid` (#920)
oieioi
authored

Commits on Feb 3, 2022

Commits on Feb 8, 2022

Bump addressable from 2.7.0 to 2.8.0 in /spec/integration/rails_6.0.2.1 (#889)
dependabot[bot]
authored

Commits on Mar 6, 2024

Put Comments on New Line for Bare Formatting

deiden26
authored and
tborg
committed
feat: add the ability to annotate nested namespaced models

Dan McAulay
authored and
tborg
committed
chore: update setup ruby ci step

Dan McAulay
authored and
tborg
committed
fix rubocop errors

Dan McAulay
authored and
tborg
committed
chore: add rails 7 support

Dan McAulay
authored and
tborg
committed
Merge branch 'master' into tborg.rebase-upstream
tborg
committed