aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-02-12 14:55:18 +0000
committerShpuld Shpludson <shp@cock.li>2019-02-12 14:55:18 +0000
commit2bc1cc9ff9700df4e9938c86274d75a8a8f59e19 (patch)
tree62745f4d09f9d0b346746d15d9a276ea8e8059f4 /src/components/user_settings/user_settings.js
parent8cce505cf53a84b82c388ac006a39e4e636b6110 (diff)
parent9f83aee1ed6d4a56150d58e6af8573718bac6529 (diff)
Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'
#255 - implement autocomplete in non post forms See merge request pleroma/pleroma-fe!551
Diffstat (limited to 'src/components/user_settings/user_settings.js')
-rw-r--r--src/components/user_settings/user_settings.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index d20bf308..fa389c3b 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -2,6 +2,7 @@ import { unescape } from 'lodash'
import TabSwitcher from '../tab_switcher/tab_switcher.js'
import StyleSwitcher from '../style_switcher/style_switcher.vue'
+import AutoCompleteInput from '../autocomplete_input/autocomplete_input.vue'
import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
const UserSettings = {
@@ -41,7 +42,8 @@ const UserSettings = {
},
components: {
StyleSwitcher,
- TabSwitcher
+ TabSwitcher,
+ AutoCompleteInput
},
computed: {
user () {