28beb28a78
- Added listen gem because rails app:update failed without it
- Removes nsa gem because it requires activesupport < 6
Oddly, there's a newer version per GitHub that's not on RubyGems
that raises the requirement to < 7. But, we need a new release
before we can use that.
- Upgrade rails-i18n to v6, for Rails 6 compatibility
- Remove redis-rails since it requires Rails < 6, but we can just use
the regular Rails :redis_cache_store that was introduced in 5.2.
- Run `rails app:update`
- Had to weed through the `config/environments` changes to pick up
newly added settings, while not losing settings that were
intentionally configured
- This generated config/initializers/new_framework_defaults_6_0.rb.
The goal is to uncomment all of the settings in that file. Once
they're all uncommented, delete the file and edit
config/application.rb's load_defaults to be 6.0.
- force_ssl controller method is deprecated in favor of a Rails
config setting.
- bin/setup was generated by Rails
- Verbose query logging in development is really helpful. It shows
you what line of code caused a query to execute.
- Calling establish_connection after worker boot isn't necessary
with ActiveRecord anymore. ActiveRecord handles it gracefully.
- Rails generated a migration to add a foreign key for ActiveStorage.
Gab currently doesn't use ActiveStorage, and instead uses Paperclip
(since ActiveStorage didn't exist when Mastadon started). So, this
change isn't relevant to Gab.
- Added ` || ''` in the profiles controller, because I was unable
to save a change to a newly created profile. (This probably
explains the 500 error I received on prod Gab recently.)
51 lines
1.4 KiB
Ruby
51 lines
1.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::ProfilesController < Settings::BaseController
|
|
include ObfuscateFilename
|
|
|
|
layout 'admin'
|
|
|
|
before_action :authenticate_user!
|
|
before_action :set_account
|
|
|
|
obfuscate_filename [:account, :avatar]
|
|
obfuscate_filename [:account, :header]
|
|
|
|
def show
|
|
@account.build_fields
|
|
end
|
|
|
|
def update
|
|
# if verified and display_name is different, return flash error and redirect back
|
|
if !@account.is_pro && params[:account][:username] && @account.username != params[:account][:username]
|
|
flash[:alert] = 'Unable to change username for your account. You are not GabPRO'
|
|
redirect_to settings_profile_path
|
|
else
|
|
if @account.username != params[:account][:username]
|
|
AccountUsernameChange.create!(
|
|
account: @account,
|
|
from_username: @account.username,
|
|
to_username: params[:account][:username] || ''
|
|
)
|
|
end
|
|
|
|
if UpdateAccountService.new.call(@account, account_params)
|
|
redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
|
|
else
|
|
@account.build_fields
|
|
render :show
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def account_params
|
|
params.require(:account).permit(:display_name, :username, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
|
|
end
|
|
|
|
def set_account
|
|
@account = current_account
|
|
end
|
|
end
|