diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:25:50 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-18 01:25:50 +0200 |
| commit | 57d784f1e454af5500b608b7a3fd1452ecbb9e6a (patch) | |
| tree | b9c4330970b1d2a62a2d41b90a6d03e2bc303b38 /app/views | |
| parent | 16d50f60d1f802ee7760ca24883df2ed5a8f4ac0 (diff) | |
| parent | ffb99325cafb5b00ee652c6b3ed2811a4d643fc8 (diff) | |
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/initial_state.json.rabl | 1 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/home/initial_state.json.rabl b/app/views/home/initial_state.json.rabl index 104049387..b599b5cf0 100644 --- a/app/views/home/initial_state.json.rabl +++ b/app/views/home/initial_state.json.rabl @@ -9,6 +9,7 @@ node(:meta) do me: current_account.id, admin: @admin.try(:id), boost_modal: current_account.user.setting_boost_modal, + auto_play_gif: current_account.user.setting_auto_play_gif, } end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 4f4326763..ce3929629 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -25,5 +25,8 @@ .fields-group = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label + .fields-group + = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label + .actions = f.button :button, t('generic.save_changes'), type: :submit |