diff options
author | ThibG <thib@sitedethib.com> | 2019-06-10 23:01:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-10 23:01:56 +0200 |
commit | c64eef12069c3476f9956dfaaf6a3a9f91c14e2d (patch) | |
tree | c8048db1bc718663c5ed33c8b225544d5e37f98b /app/controllers/settings/notifications_controller.rb | |
parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
parent | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (diff) |
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/notifications_controller.rb')
-rw-r--r-- | app/controllers/settings/notifications_controller.rb | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb deleted file mode 100644 index 7d7e237fb..000000000 --- a/app/controllers/settings/notifications_controller.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true - -class Settings::NotificationsController < Settings::BaseController - def show; end - - def update - user_settings.update(user_settings_params.to_h) - - if current_user.save - redirect_to settings_notifications_path, notice: I18n.t('generic.changes_saved_msg') - else - render :show - end - end - - private - - def user_settings - UserSettingsDecorator.new(current_user) - end - - def user_settings_params - params.require(:user).permit( - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), - interactions: %i(must_be_follower must_be_following must_be_following_dm) - ) - end -end |