Merge remote-tracking branch 'remotes/origin/master' into ft-activity…

…-tap
spatie · Jan 29, 2019 · 5323625 · 5323625
2 parents e8af88d + 492fa4c
commit 5323625
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ All notable changes to `spatie/laravel-activitylog` will be documented in this f
 - the `activity` relation of the `CausesActivity` trait has been renamed to `actions`
 - the `activity` relation of the `LogsActivity` trait has been renamed to `activities`
 - the deprecated `loggedActivity` relation has been removed
+- the `HasActivity` trait has been removed.
 - fix for setting a custom table name for the `Activity` model via the `$table` property
 - support for PHP 7.0 has been dropped
 

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -5,4 +5,5 @@
 `$activity->changes()` to `$activity->changes`
 - the `activity` relation of the `CausesActivity` trait has been renamed to `actions`.  Rename all uses from `$user->activity` to `$user->actions`
 - the `activity` relation of the `LogsActivity` trait has been renamed to `activities`. Rename all uses from `$yourModel->activity` to `$yourModel->activities`.
-- the deprecated `loggedActivity` relation has been removed. Use `activities` instead.
+- the deprecated `loggedActivity` relation has been removed. Use `activities` instead.
+- the `HasActivity` trait has been removed. Use both `CausesActivity` and `LogsActivity` traits instead.