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

Resolve "Capi call for compatible batteries" #1568

Open
korina.cordero wants to merge 3 commits from 645-capi-call-for-compatible-batteries into master
pull from: 645-capi-call-for-compatible-batteries
merge into: rgutierrez:master
Conversation 4 Commits 3 Files changed 3 +174
korina.cordero commented 2022-02-03 07:18:34 +00:00 (Migrated from gitlab.com)
Copy link

Closes #645

Closes #645
korina.cordero commented 2022-02-03 10:23:13 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 4ab10b90 - Add controller to return vehicle, battery, and vehicle battery compatibility data. #645

Compare with previous version

added 1 commit <ul><li>4ab10b90 - Add controller to return vehicle, battery, and vehicle battery compatibility data. #645</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/757/diffs?diff_id=324086819&start_sha=e986d07f70b9fec464c1a2297683866f06bd8341)
korina.cordero commented 2022-02-03 10:25:36 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>98dae763 - Add permission and route for call. #645</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/757/diffs?diff_id=324089077&start_sha=4ab10b9002d7aaa45ffce455e6a947c891adb731)
korina.cordero commented 2022-02-03 11:24:11 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>213652f1 - Remove image file from response. #645</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/757/diffs?diff_id=324145822&start_sha=98dae763669e057b63da6ac91290401250c74937)
korina.cordero commented 2022-02-03 11:34:24 +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.
  • config/api_acl.yaml
  • config/routes/capi.yaml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 645-capi-call-for-compatible-batteries:645-capi-call-for-compatible-batteries
git checkout 645-capi-call-for-compatible-batteries

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 645-capi-call-for-compatible-batteries
git checkout 645-capi-call-for-compatible-batteries
git rebase master
git checkout master
git merge --ff-only 645-capi-call-for-compatible-batteries
git checkout 645-capi-call-for-compatible-batteries
git rebase master
git checkout master
git merge --no-ff 645-capi-call-for-compatible-batteries
git checkout master
git merge --squash 645-capi-call-for-compatible-batteries
git checkout master
git merge --ff-only 645-capi-call-for-compatible-batteries
git checkout master
git merge 645-capi-call-for-compatible-batteries
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#1568
No description provided.
Delete branch "645-capi-call-for-compatible-batteries"

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?