diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-06-27 07:19:49 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-06-27 07:19:49 +0000 |
| commit | ea0a12f6049241cb9e8fa7cd5bc6dc8b9852b57c (patch) | |
| tree | 36863abf8ac320756bc16906b11a7892ea7da0dc /src/components/settings_modal/tabs/profile_tab.js | |
| parent | bad3dacfac1ef3dd2c0f55b53fb78f4bf410a01e (diff) | |
| parent | bbb91d8ae3f1c3d5374de7610e723e63121e8222 (diff) | |
Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
Diffstat (limited to 'src/components/settings_modal/tabs/profile_tab.js')
| -rw-r--r-- | src/components/settings_modal/tabs/profile_tab.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js index 0874e0c8..e6db802d 100644 --- a/src/components/settings_modal/tabs/profile_tab.js +++ b/src/components/settings_modal/tabs/profile_tab.js @@ -25,6 +25,7 @@ const ProfileTab = { showRole: this.$store.state.users.currentUser.show_role, role: this.$store.state.users.currentUser.role, discoverable: this.$store.state.users.currentUser.discoverable, + bot: this.$store.state.users.currentUser.bot, allowFollowingMove: this.$store.state.users.currentUser.allow_following_move, pickAvatarBtnVisible: true, bannerUploading: false, @@ -94,6 +95,7 @@ const ProfileTab = { hide_follows: this.hideFollows, hide_followers: this.hideFollowers, discoverable: this.discoverable, + bot: this.bot, allow_following_move: this.allowFollowingMove, hide_follows_count: this.hideFollowsCount, hide_followers_count: this.hideFollowersCount, |