1159490f00
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
39 lines
797 B
Ruby
39 lines
797 B
Ruby
# frozen_string_literal: true
|
|
|
|
class Auth::ConfirmationsController < Devise::ConfirmationsController
|
|
layout 'auth'
|
|
|
|
before_action :set_body_classes
|
|
before_action :set_user, only: [:finish_signup]
|
|
before_action :set_pack
|
|
|
|
# GET/PATCH /users/:id/finish_signup
|
|
def finish_signup
|
|
return unless request.patch? && params[:user]
|
|
if @user.update(user_params)
|
|
@user.skip_reconfirmation!
|
|
bypass_sign_in(@user)
|
|
redirect_to root_path, notice: I18n.t('devise.confirmations.send_instructions')
|
|
else
|
|
@show_errors = true
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def set_pack
|
|
use_pack 'auth'
|
|
end
|
|
|
|
def set_user
|
|
@user = current_user
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'lighter'
|
|
end
|
|
|
|
def user_params
|
|
params.require(:user).permit(:email)
|
|
end
|
|
end
|