mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 21:26:52 +00:00
bf94a43496
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
20 lines
473 B
Ruby
20 lines
473 B
Ruby
# frozen_string_literal: true
|
|
|
|
# Intentionally does not inherit from BaseController
|
|
class Settings::SessionsController < ApplicationController
|
|
before_action :authenticate_user!
|
|
before_action :set_session, only: :destroy
|
|
|
|
def destroy
|
|
@session.destroy!
|
|
flash[:notice] = I18n.t('sessions.revoke_success')
|
|
redirect_to edit_user_registration_path
|
|
end
|
|
|
|
private
|
|
|
|
def set_session
|
|
@session = current_user.session_activations.find(params[:id])
|
|
end
|
|
end
|