diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-25 13:33:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 13:33:00 +0100 |
| commit | 959e4b81987080353415556cc3bbd2aab478adb4 (patch) | |
| tree | 5db6ed034f98ac8f2ef34b48d2032b74617d21d1 /app/views | |
| parent | effdb42f4c63b957cfdef37a44dfa45284ece337 (diff) | |
| parent | 8a3745a4df89f5a5f980370dabfab8f95c92a5f8 (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 693702ff7..db5b9fb48 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -12,6 +12,10 @@ = ff.input :favourite, as: :boolean, wrapper: :with_label = ff.input :mention, as: :boolean, wrapper: :with_label + = f.simple_fields_for :interactions, current_user.settings(:interactions) do |ff| + = ff.input :must_be_follower, as: :boolean, wrapper: :with_label + = ff.input :must_be_following, as: :boolean, wrapper: :with_label + .actions = f.button :button, t('generic.save_changes'), type: :submit |