diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-11 20:43:56 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-11 20:43:56 +0200 |
| commit | 2a7602cad449da3590cb1eac2a86a3e5cc606966 (patch) | |
| tree | e315f30c6cb4b40b670e9cbd15065851d5f44a33 /app/views | |
| parent | b723ee73fc7d74fd5908eb09a8f6b98e73597c2b (diff) | |
| parent | 06444bf050a267da7001c2801480c5fae3e1559e (diff) | |
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
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 71949ab0e..caee2bfc7 100644 --- a/app/views/home/initial_state.json.rabl +++ b/app/views/home/initial_state.json.rabl @@ -5,6 +5,7 @@ node(:meta) do access_token: @token, locale: I18n.locale, me: current_account.id, + boost_modal: current_account.user.setting_boost_modal, } end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 64cf32c3a..e819429b6 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -22,5 +22,8 @@ = ff.input :must_be_follower, as: :boolean, wrapper: :with_label = ff.input :must_be_following, as: :boolean, wrapper: :with_label + .fields-group + = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label + .actions = f.button :button, t('generic.save_changes'), type: :submit |