tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	db/schema.rb
This commit is contained in:
David Yip
2018-04-14 09:12:50 -05:00
parent e3d0d72b29 78ed4ab75f
commit 813da6788e
18 changed files with 274 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/settings/profiles/show.html.haml
View File

@ -19,6 +19,16 @@
.fields-group
= f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
.fields-group
.input.with_block_label
%label= t('simple_form.labels.defaults.fields')
%span.hint= t('simple_form.hints.defaults.fields')
= f.simple_fields_for :fields do |fields_f|
.row
= fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name')
= fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value')
.actions
= f.button :button, t('generic.save_changes'), type: :submit