[ENG-2185]#7133

Merged

JadeCara merged 33 commits intomainfrom

ENG-2185-add-new-jsob-tree-col

Jan 12, 2026

Commits on Dec 15, 2025

initial
Jade Wibbels
committed

Commits on Dec 16, 2025

added jsonb col and updated tests
Jade Wibbels
committed
Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
JadeCara
authored
update db yml
Jade Wibbels
committed
test updates
Jade Wibbels
committed

Commits on Dec 17, 2025

clean up alembic file
Jade Wibbels
committed
remove extra definition
Jade Wibbels
committed
remove extra definition
Jade Wibbels
committed
fix return
Jade Wibbels
committed
some clean ups
Jade Wibbels
committed
Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
JadeCara
authored

Commits on Dec 18, 2025

Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
Jade Wibbels
committed
missed one
Jade Wibbels
committed
Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
JadeCara
authored
fix tests
Jade Wibbels
committed
Merge branch 'ENG-2185-add-new-jsob-tree-col' of github.com:ethyca/fides into ENG-2185-add-new-jsob-tree-col
Jade Wibbels
committed

Commits on Dec 29, 2025

clean up
Jade Wibbels
committed
clean up
Jade Wibbels
committed
Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
JadeCara
authored
fix
Jade Wibbels
committed

Commits on Dec 30, 2025

.
Jade Wibbels
committed
Apply suggestion from @JadeCara
JadeCara
authored

Commits on Jan 5, 2026

small udpates
Jade Wibbels
committed
small docstring clean ups
Jade Wibbels
committed
Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
JadeCara
authored

Commits on Jan 6, 2026

changed get_root_condition to get_condition_tree
Jade Wibbels
committed
move from raw string to constant
Jade Wibbels
committed
Merge branch 'main' into ENG-2185-add-new-jsob-tree-col
JadeCara
authored

Commits on Jan 12, 2026