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

Resolve "Create geofence blacklist" #1610

Open
korina.cordero wants to merge 2 commits from 685-create-geofence-blacklist into master
pull from: 685-create-geofence-blacklist
merge into: rgutierrez:master
Conversation 4 Commits 2 Files changed 9 +545 -10
korina.cordero commented 2022-06-13 06:02:52 +00:00 (Migrated from gitlab.com)
Copy link

Closes #685

Closes #685
korina.cordero commented 2022-06-13 06:02:52 +00:00 (Migrated from gitlab.com)
Copy link

assigned to @korina.cordero

assigned to @korina.cordero
korina.cordero commented 2022-06-13 08:11:58 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

  • 738cd745 - Add list, create, delete for blacklisted areas. #685

Compare with previous version

added 1 commit <ul><li>738cd745 - Add list, create, delete for blacklisted areas. #685</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/799/diffs?diff_id=414858223&start_sha=54f065d30fc21ebf32ac6920a2a6f27e8a0cb61b)
korina.cordero commented 2022-06-13 09:49:04 +00:00 (Migrated from gitlab.com)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>ab20d27c - Add blacklist checking in geofence service. #685</li></ul> [Compare with previous version](/jankstudio/resq/-/merge_requests/799/diffs?diff_id=414958798&start_sha=738cd74522e980a86d911a218c1b082b1898dc28)
korina.cordero commented 2022-06-13 10:00:59 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as ready

marked this merge request as **ready**
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 685-create-geofence-blacklist:685-create-geofence-blacklist
git checkout 685-create-geofence-blacklist

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 685-create-geofence-blacklist
git checkout 685-create-geofence-blacklist
git rebase master
git checkout master
git merge --ff-only 685-create-geofence-blacklist
git checkout 685-create-geofence-blacklist
git rebase master
git checkout master
git merge --no-ff 685-create-geofence-blacklist
git checkout master
git merge --squash 685-create-geofence-blacklist
git checkout master
git merge --ff-only 685-create-geofence-blacklist
git checkout master
git merge 685-create-geofence-blacklist
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#1610
No description provided.
Delete branch "685-create-geofence-blacklist"

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?