rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

WIP: Resolve "Per Rider Volume Report" #1145

Draft
korina.cordero wants to merge 3 commits from 292-per-rider-volume-report into master
pull from: 292-per-rider-volume-report
merge into: rgutierrez:master
Conversation 2 Commits 3 Files changed 7 +360 -4
korina.cordero commented 2020-01-07 05:34:41 +00:00 (Migrated from gitlab.com)
Copy link

Closes #292

Closes #292
korina.cordero commented 2020-01-07 05:36:07 +00:00 (Migrated from gitlab.com)
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>e16e8a7c - Add call volume report links and routes. #294</li><li>3546268c - Add call volume report. #294</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/334/diffs?diff_id=69744041&start_sha=ec5b8951da5be18aeee2e68b74ac1241f307c5d0)
korina.cordero commented 2020-01-07 07:26:11 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>10906b9e - Add Per Rider Volume Report to reports. #292</li></ul> [Compare with previous version](/jankstudio/resq/merge_requests/334/diffs?diff_id=69754898&start_sha=3546268c881c8c94bcf850137a22097351e17d20)
This pull request has changes conflicting with the target branch.
  • config/acl.yaml
  • config/routes/report.yaml
  • src/Controller/ReportController.php
  • src/Entity/Rider.php
  • templates/base.html.twig
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 292-per-rider-volume-report:292-per-rider-volume-report
git checkout 292-per-rider-volume-report

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 checkout master
git merge --no-ff 292-per-rider-volume-report
git checkout 292-per-rider-volume-report
git rebase master
git checkout master
git merge --ff-only 292-per-rider-volume-report
git checkout 292-per-rider-volume-report
git rebase master
git checkout master
git merge --no-ff 292-per-rider-volume-report
git checkout master
git merge --squash 292-per-rider-volume-report
git checkout master
git merge --ff-only 292-per-rider-volume-report
git checkout master
git merge 292-per-rider-volume-report
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API

   
AU

Marshall Battery Feature

  
Bug

Bug

  
CRM Enhancements

   
Mobile API

   
Nice to have

   
Phase 2

Local Phase 2

No labels
API
AU
Bug
CRM Enhancements
Mobile API
Nice to have
Phase 2
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: rgutierrez/resq#1145
No description provided.
Delete branch "292-per-rider-volume-report"

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?