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.

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

Implement @forceDelete and @restore directives #941

Merged
merged 27 commits into from
Sep 3, 2019
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5528ce0
implement @forceDelete and @restore directives
lorado Aug 30, 2019
4983089
update link to PR
lorado Aug 30, 2019
6b16c3d
refactor delete, restore and forceDelete to reduce duplicated code
lorado Aug 30, 2019
0131dc4
fix ternary - use `withTrashed` on forceDelete too
lorado Aug 30, 2019
c5573ae
Add missing test - forceDelete when model is already soft deleted
lorado Aug 30, 2019
93e16bf
fix code style
lorado Aug 30, 2019
62414a7
Merge remote-tracking branch 'master/master' into implement-restore-a…
lorado Aug 30, 2019
c078572
Merge from master, set directives definitions
lorado Aug 30, 2019
9b5e74b
Make the code and docs more explicit
spawnia Sep 2, 2019
b7263a5
merge
spawnia Sep 2, 2019
5dd77a2
Merge branch 'master' into implement-restore-and-forceDelete
spawnia Sep 2, 2019
dcc5126
Merge branch 'master' into implement-restore-and-forceDelete
spawnia Sep 2, 2019
49514bc
Fix changelog
spawnia Sep 2, 2019
37075ca
Fix directives
spawnia Sep 2, 2019
805acb6
style
spawnia Sep 2, 2019
1b1c7d7
Merge remote-tracking branch 'master/master' into implement-restore-a…
lorado Sep 2, 2019
f3131a1
Merge remote-tracking branch 'master/master' into implement-restore-a…
lorado Sep 2, 2019
9f13cf0
@forceDelete and @restore now verify usage of SoftDeletes
lorado Sep 2, 2019
cfc46e0
update docs
lorado Sep 2, 2019
039e291
fix style
lorado Sep 2, 2019
5d2d69b
fix style
lorado Sep 2, 2019
373a113
Merge branch 'master' into implement-restore-and-forceDelete
spawnia Sep 3, 2019
9310e21
Validate requirements for argument definitions of `@delete`, `@forceD…
spawnia Sep 3, 2019
3b9f47f
Factor out SoftDeletes into module
spawnia Sep 3, 2019
6f93e5e
style
spawnia Sep 3, 2019
f412673
Include SoftDeletesServiceProvider by default
spawnia Sep 3, 2019
0311526
fix style
lorado Sep 3, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'master/master' into implement-restore-a…
…nd-forceDelete

# Conflicts:
#	CHANGELOG.md
  • Loading branch information
lorado committed Sep 2, 2019
commit f3131a13881315374016552392e7540fb0fb0469
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Add `@restore` and `@forceDelete` directives, similar to `@delete` https://github.com/nuwave/lighthouse/pull/941
- Add `@softDeletes` and `@trashed` directives to enable
filtering soft deleted models https://github.com/nuwave/lighthouse/pull/937

## [4.2.1](https://github.com/nuwave/lighthouse/compare/v4.2.0...v4.2.1)

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.