Merge branch 'feature/rails_6' into 'develop'
Upgrade to Rails 6 See merge request gab/social/gab-social!52
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user