diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-15 13:14:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-15 13:14:41 +0000 |
| commit | 9364964b017154f61072ffa70b08f2ed0c7dcaeb (patch) | |
| tree | bcc17450b6d66df1c12acf25eea05fb5d4ed34ab /src/components/user_profile/user_profile.vue | |
| parent | 92eb55c7bc3cf210b86259b99c3e2b8f192bf325 (diff) | |
| parent | 71c12fa3a58ff2b498ed5ba9d3fc3d58d016bd97 (diff) | |
Merge branch 'mastoapi/user-stuff' into 'develop'
Transition to MastoAPI: user data
See merge request pleroma/pleroma-fe!655
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 7d4a8b1f..d449eb85 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -11,7 +11,7 @@ :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" - :user-id="fetchBy" + :user-id="userId" /> <div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count"> <FriendList :userId="userId" /> @@ -25,7 +25,7 @@ :embedded="true" :title="$t('user_card.media')" timeline-name="media" :timeline="media" - :user-id="fetchBy" + :user-id="userId" /> <Timeline v-if="isUs" |