babka/mastodon-babka
2
0
Fork 0
Code Issues Pull requests 10 Projects Releases 4 Packages Wiki Activity Actions

Remove privacy policy box and agreement_tos field as we now only need a single... #48

Open
CSDUMMI wants to merge 1 commit from remove-privacy-policy-checkbox into babka
pull from: remove-privacy-policy-checkbox
merge into: babka:babka
Conversation 4 Commits 1 Files changed 17 +22 -747
CSDUMMI commented 2024-09-19 13:46:04 +00:00 (Migrated from gitlab.com)
Copy link

Remove privacy policy box and agreement_tos field as we now only need a single 'agreement' field. This reduces the effort needed to resolve merge conflicts with upstream in the future. (Closes #12)

Remove privacy policy box and agreement_tos field as we now only need a single 'agreement' field. This reduces the effort needed to resolve merge conflicts with upstream in the future. (Closes #12)
CSDUMMI commented 2024-09-19 13:46:04 +00:00 (Migrated from gitlab.com)
Copy link

requested review from @emacsen

requested review from @emacsen
CSDUMMI commented 2024-09-19 13:46:04 +00:00 (Migrated from gitlab.com)
Copy link

assigned to @CSDUMMI

assigned to @CSDUMMI
CSDUMMI commented 2024-09-19 14:08:13 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 0f65fb8b - Remove privacy policy checkbox and agreement_tos field.

Compare with previous version

added 1 commit <ul><li>0f65fb8b - Remove privacy policy checkbox and agreement_tos field.</li></ul> [Compare with previous version](/babka_net/mastodon-babka/-/merge_requests/30/diffs?diff_id=1125491075&start_sha=d7ac16b9ef1762c43b1d08e7133fa7475b466c7d)
CSDUMMI commented 2024-09-19 14:09:14 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

marked this merge request as **ready**
This pull request has changes conflicting with the target branch.
  • app/views/auth/registrations/new.html.haml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin remove-privacy-policy-checkbox:remove-privacy-policy-checkbox
git switch remove-privacy-policy-checkbox

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch babka
git merge --no-ff remove-privacy-policy-checkbox
git switch remove-privacy-policy-checkbox
git rebase babka
git switch babka
git merge --ff-only remove-privacy-policy-checkbox
git switch remove-privacy-policy-checkbox
git rebase babka
git switch babka
git merge --no-ff remove-privacy-policy-checkbox
git switch babka
git merge --squash remove-privacy-policy-checkbox
git switch babka
git merge --ff-only remove-privacy-policy-checkbox
git switch babka
git merge remove-privacy-policy-checkbox
git push origin babka
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
confirmed

   
critical

   
discussion

   
documentation

   
enhancement

   
merge-upstream

   
suggestion

   
support
No labels
bug
confirmed
critical
discussion
documentation
enhancement
merge-upstream
suggestion
support
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
babka/mastodon-babka!48
No description provided.