Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DELETE || ESTATE #35

Merged
merged 10 commits into from
Oct 31, 2021
Merged

DELETE || ESTATE #35

merged 10 commits into from
Oct 31, 2021

Conversation

ElhamFadel
Copy link
Contributor

@ElhamFadel ElhamFadel commented Oct 28, 2021 •
edited
Loading

  • success

screenShoot

  • Faild

404

  • test

estate

@ElhamFadel ElhamFadel marked this pull request as draft October 28, 2021 13:12
@ElhamFadel ElhamFadel self-assigned this Oct 28, 2021
@ElhamFadel ElhamFadel linked an issue Oct 28, 2021 that may be closed by this pull request
DELETE | /estate/:estateId #7
Closed
@ElhamFadel ElhamFadel marked this pull request as ready for review October 28, 2021 18:33
Mu7ammadAbed
Mu7ammadAbed requested changes Oct 29, 2021
View reviewed changes
server/controllers/estates/deleteEstate.js Show resolved Hide resolved
server/controllers/estates/deleteEstate.js Outdated Show resolved Hide resolved
server/controllers/estates/deleteEstate.js Outdated Show resolved Hide resolved
server/controllers/estates/deleteEstate.js Outdated Show resolved Hide resolved
server/index.js Outdated Show resolved Hide resolved
Mu7ammadAbed
Mu7ammadAbed requested changes Oct 30, 2021
View reviewed changes
server/controllers/estates/deleteEstate.js Outdated Show resolved Hide resolved
server/controllers/estates/deleteEstate.js Outdated Show resolved Hide resolved
Mu7ammadAbed
Mu7ammadAbed previously approved these changes Oct 30, 2021
View reviewed changes
@Mu7ammadAbed
Copy link
Member

Resolve the conflicts and be aware while fixing the test file since some lines would consider them as mutual while they are different and need to be copied and pasted again.

@ElhamFadel ElhamFadel merged commit d145c6e into development Oct 31, 2021
@ElhamFadel ElhamFadel deleted the 7-delete-estate branch October 31, 2021 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@muhammadharoun muhammadharoun muhammadharoun approved these changes

@Mu7ammadAbed Mu7ammadAbed Mu7ammadAbed approved these changes

@mohammedsalah7 mohammedsalah7 mohammedsalah7 approved these changes

@ameera-abed ameera-abed Awaiting requested review from ameera-abed

Assignees

@ElhamFadel ElhamFadel

Labels
Awaiting Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DELETE | /estate/:estateId
4 participants
@ElhamFadel @Mu7ammadAbed @mohammedsalah7 @muhammadharoun