diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-12 17:36:05 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-12 17:36:05 +0000 |
| commit | 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 (patch) | |
| tree | f4a7a9c10d00083b36fb331c1d9196dc391dcfc7 /src/components/account_actions/account_actions.vue | |
| parent | a0f780c4550b77d4574e0de8932a2dff288784a3 (diff) | |
| parent | 0bc0a8d5f51f88858a7347b915361c45ff819292 (diff) | |
Merge branch 'rc/2.0.5' into 'master'
Update MASTER for 2.0.5 patch
See merge request pleroma/pleroma-fe!1105
Diffstat (limited to 'src/components/account_actions/account_actions.vue')
| -rw-r--r-- | src/components/account_actions/account_actions.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue index 483783cf..744b77d5 100644 --- a/src/components/account_actions/account_actions.vue +++ b/src/components/account_actions/account_actions.vue @@ -9,16 +9,16 @@ class="account-tools-popover" > <div class="dropdown-menu"> - <template v-if="user.following"> + <template v-if="relationship.following"> <button - v-if="user.showing_reblogs" + v-if="relationship.showing_reblogs" class="btn btn-default dropdown-item" @click="hideRepeats" > {{ $t('user_card.hide_repeats') }} </button> <button - v-if="!user.showing_reblogs" + v-if="!relationship.showing_reblogs" class="btn btn-default dropdown-item" @click="showRepeats" > @@ -30,7 +30,7 @@ /> </template> <button - v-if="user.statusnet_blocking" + v-if="relationship.blocking" class="btn btn-default btn-block dropdown-item" @click="unblockUser" > |