Skip to content

chore: sync staging and main - (PRs: #1054, #1064) - #1065

Merged
Winzen merged 7 commits into
stagingfrom
chore/main_to_staging
Aug 20, 2026
Merged

chore: sync staging and main - (PRs: #1054, #1064)#1065
Winzen merged 7 commits into
stagingfrom
chore/main_to_staging

Conversation

@Winzen

@Winzen Winzen commented Aug 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Descrição das Alterações

Este Pull Request tem como objetivo atualizar a branch atual com as últimas alterações da branch main, garantindo que a base de código esteja alinhada com as mudanças mais recentes.

Merge de main em staging, mantendo o histórico de staging intacto (sem conflitos reais — -X ours aplicado por padronização).

rdahis and others added 7 commits August 19, 2026 13:32
@rdahis
docs: correct CLAUDE.md Git Flow model (branch from main, same commit…
328955b 
…s) (#1054)
@rdahis
fix(account): return Google OAuth to the originating frontend domain (#…
00d8d9b 
…1046)

(cherry picked from commit 5f5854e)
(cherry picked from commit eaeac75)
@rdahis
refactor(account): remove legacy Career.team_old and role_old fields (#…
181e514 
…1048)

(cherry picked from commit 0e806c4)
(cherry picked from commit ee60b8c)
@AldemirLucas @Winzen
feat: email end trial (#1061)
76411be 
Co-authored-by: Winzen <luiz.sinx02@gmail.com>
@rdahis
Merge pull request #1062 from basedosdados/fix/google-login-and-migra…
9dd445c 
…tions

fix(account): Google OAuth originating domain + remove legacy Career fields
@Winzen
feat(admin_data_tools): add search by flow_name to Disabled Flow Sche…
87760f2 
…dules (#1064)

Adiciona search_fields = ["flow_name"] ao DisabledFlowScheduleAdmin, permitindo pesquisar os flows pelo nome na página "Disabled Flow Schedules" do admin.
@Winzen
chore: sync staging and main
4bd363a
@mergify

mergify Bot commented Aug 20, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@Winzen Winzen self-assigned this Aug 20, 2026
@Winzen Winzen added sync Aplicar em PRs que fazem merge de main → staging, develop, ou outras branches de longa duração. staging Indica que o Pull Request está com a branch de destino (base) apontando para staging labels Aug 20, 2026
@Winzen
Winzen merged commit 3cb4c71 into staging Aug 20, 2026
5 checks passed
@Winzen
Winzen deleted the chore/main_to_staging branch August 20, 2026 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Winzen Winzen

Labels

staging Indica que o Pull Request está com a branch de destino (base) apontando para staging sync Aplicar em PRs que fazem merge de main → staging, develop, ou outras branches de longa duração.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Winzen @rdahis @AldemirLucas