Merge branch 'gab_provision' of https://code.gab.com/gab/social/gab-social into develop

This commit is contained in:
admin
2021-01-27 16:16:48 -05:00
28 changed files with 353 additions and 202 deletions

View File

@@ -5,8 +5,6 @@ class ApplicationController < ActionController::Base
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
force_ssl if: :https_enabled?
include Localized
include UserTrackingConcern
include SessionTrackingConcern
@@ -31,10 +29,6 @@ class ApplicationController < ActionController::Base
private
def https_enabled?
Rails.env.production?
end
def store_current_location
store_location_for(:user, request.url) if request.format == :html
end

View File

@@ -25,7 +25,7 @@ class Settings::ProfilesController < Settings::BaseController
AccountUsernameChange.create!(
account: @account,
from_username: @account.username,
to_username: params[:account][:username]
to_username: params[:account][:username] || ''
)
end