1
2
Fork
You've already forked treehouse
1

Add leftover field to meal form #191

Open
etienne wants to merge 1 commit from leftovers into main
pull from: leftovers
merge into: etienne:main
etienne:main
etienne:review-meal
etienne:concert-mailing-list
etienne:email-community-fund
etienne:add-remove-from-funds
etienne:ledger
etienne:clean-up-reminder-email
etienne:no-take-out
etienne:delete-booking
etienne:free-night
etienne:open-concerts
etienne:more-concert-2
etienne:concert-admin
etienne:car-share-whitelist
etienne:more-concert
etienne:more-car-admin
etienne:concert
etienne:meal-setting-clean-up
etienne:car-share-admin
etienne:car-payment-fund
etienne:fix-car-fund-relationship
etienne:documentation
etienne:new-farmer
etienne:add-library-item
etienne:croppie
etienne:simplify-meal-system
etienne:implement-meal-role
etienne:team-members-in-db
etienne:settigs-class
etienne:library-v1
etienne:various-fixes
etienne:seating-size
etienne:tool-library-6
etienne:meal-associations
etienne:kamal
etienne:extract-tve-meals-features
etienne:dev_setup_script
etienne:checkout-checklist
etienne:tve-controller
etienne:split-admin-controller
etienne:tve-override
etienne:scottd-dev-setup
etienne:195-meal-team-members
etienne:sqlite-dev
etienne:multiple-seatings-1
etienne:multiple-seatings-2
etienne:google-api
etienne:portion-name-desc
etienne:data-integrity
etienne:upgrade-ruby
etienne:gem-upgrade
etienne:finish-car-booking-payment
etienne:car-booking-payments
etienne:admin-meal-payments
etienne:meal_payments
etienne:eggs-page
etienne:description-for-transfers
etienne:area-booking-max-limit
etienne:upgrade-ch-area
etienne:areas-part-3
etienne:add-remove-money-admin
etienne:manage-rooms
etienne:last-details-around-meal
etienne:close-meal-service
etienne:refine-transfers
etienne:eb-household-and-attendees
etienne:add-fund-email
etienne:meal-sign-up
etienne:add-state-to-payments
etienne:meal-screens
etienne:add-children
etienne:meal-models
etienne:66-transaction-table
etienne:66-create-tabs-for-funds
etienne:66-create-fund
etienne:add-bookings-to-car-page
etienne:note-for-car-bookings
etienne:car-owner
etienne:open-car-sharing
etienne:update-room-booking
etienne:room-booking-to-use-dates
etienne:collapse-cars
etienne:prepare-car-booking
etienne:charging-color
etienne:a-round-of-refactor
etienne:ajax-for-car-booking
etienne:fix-car-booking
etienne:add-columns-to-car-and-booking
etienne:car-sharing-algorithm
etienne:ajax-calls
etienne:reorganize-secrets
etienne:create-car-booking
etienne:master
etienne:car-calendar-color
etienne:book-a-car
etienne:remove-user
etienne:update-packages
etienne:fix-booking-confirmation
etienne:open-marketplace
etienne:pricing-options
etienne:add-cron-for-emails
etienne:19-ten-day-booking
etienne:19-some-rules-for-booking
etienne:feedback-from-becky
etienne:19-emails-and-guest-room-admin
etienne:19-pay-by-night
etienne:19-create-payments
etienne:19-ten-days-credit
etienne:19-household-name-logic
etienne:19-room-booking-confirmations
etienne:19-create-households
etienne:19-guest-room-admin
etienne:19-users-roles-table
etienne:marketplace-search
etienne:add-tests
No description provided.
This pull request has changes conflicting with the target branch.
  • app/controllers/meals_controller.rb
  • app/models/meal.rb
  • app/views/meal_mailer/notify_members.html.haml
  • app/views/meal_payments/_form.html.haml
  • db/schema.rb
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 leftovers:leftovers
git switch leftovers

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 main
git merge --no-ff leftovers
git switch leftovers
git rebase main
git switch main
git merge --ff-only leftovers
git switch leftovers
git rebase main
git switch main
git merge --no-ff leftovers
git switch main
git merge --squash leftovers
git switch main
git merge --ff-only leftovers
git switch main
git merge leftovers
git push origin main
Sign in to join this conversation.
No reviewers
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
etienne/treehouse!191
Reference in a new issue
etienne/treehouse
No description provided.
Delete branch "leftovers"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?