Merge branch 'gab_provision' of https://code.gab.com/gab/social/gab-social into develop
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
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#
|
||||
# Table name: accounts
|
||||
#
|
||||
# id :bigint(8) not null, primary key
|
||||
# username :string default(""), not null
|
||||
# domain :string
|
||||
# secret :string default(""), not null
|
||||
@@ -20,11 +19,11 @@
|
||||
# url :string
|
||||
# avatar_file_name :string
|
||||
# avatar_content_type :string
|
||||
# avatar_file_size :integer
|
||||
# avatar_file_size :bigint(8)
|
||||
# avatar_updated_at :datetime
|
||||
# header_file_name :string
|
||||
# header_content_type :string
|
||||
# header_file_size :integer
|
||||
# header_file_size :bigint(8)
|
||||
# header_updated_at :datetime
|
||||
# avatar_remote_url :string
|
||||
# subscription_expires_at :datetime
|
||||
@@ -36,6 +35,7 @@
|
||||
# shared_inbox_url :string default(""), not null
|
||||
# followers_url :string default(""), not null
|
||||
# protocol :integer default(0), not null
|
||||
# id :bigint(8) not null, primary key
|
||||
# memorial :boolean default(FALSE), not null
|
||||
# moved_to_account_id :bigint(8)
|
||||
# featured_collection_url :string
|
||||
@@ -43,10 +43,10 @@
|
||||
# actor_type :string
|
||||
# discoverable :boolean
|
||||
# also_known_as :string is an Array
|
||||
# silenced_at :datetime
|
||||
# suspended_at :datetime
|
||||
# is_pro :boolean default(FALSE), not null
|
||||
# pro_expires_at :datetime
|
||||
# silenced_at :datetime
|
||||
# suspended_at :datetime
|
||||
# is_verified :boolean default(FALSE), not null
|
||||
# is_donor :boolean default(FALSE), not null
|
||||
# is_investor :boolean default(FALSE), not null
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# user_id :bigint(8)
|
||||
# dump_file_name :string
|
||||
# dump_content_type :string
|
||||
# dump_file_size :integer
|
||||
# dump_file_size :bigint(8)
|
||||
# dump_updated_at :datetime
|
||||
# processed :boolean default(FALSE), not null
|
||||
# created_at :datetime not null
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# is_approved :boolean default(FALSE), not null
|
||||
# created_at :datetime not null
|
||||
# updated_at :datetime not null
|
||||
# unread_count :bigint(8) default(0), not null
|
||||
# unread_count :bigint(8) default(0)
|
||||
# chat_message_expiration_policy :string
|
||||
# is_muted :boolean default(FALSE), not null
|
||||
#
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# domain :string
|
||||
# image_file_name :string
|
||||
# image_content_type :string
|
||||
# image_file_size :integer
|
||||
# image_file_size :bigint(8)
|
||||
# image_updated_at :datetime
|
||||
# created_at :datetime not null
|
||||
# updated_at :datetime not null
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# description :string not null
|
||||
# cover_image_file_name :string
|
||||
# cover_image_content_type :string
|
||||
# cover_image_file_size :integer
|
||||
# cover_image_file_size :bigint(8)
|
||||
# cover_image_updated_at :datetime
|
||||
# is_nsfw :boolean default(FALSE), not null
|
||||
# is_featured :boolean default(FALSE), not null
|
||||
@@ -18,7 +18,7 @@
|
||||
# member_count :integer default(0)
|
||||
# slug :text
|
||||
# is_private :boolean default(FALSE)
|
||||
# is_visible :boolean default(FALSE)
|
||||
# is_visible :boolean default(TRUE)
|
||||
# tags :string default([]), is an Array
|
||||
# password :string
|
||||
# group_category_id :integer
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# id :bigint(8) not null, primary key
|
||||
# list_id :bigint(8) not null
|
||||
# account_id :bigint(8) not null
|
||||
# follow_id :bigint(8) default(1)
|
||||
# follow_id :bigint(8)
|
||||
#
|
||||
|
||||
class ListAccount < ApplicationRecord
|
||||
|
||||
@@ -3,11 +3,10 @@
|
||||
#
|
||||
# Table name: media_attachments
|
||||
#
|
||||
# id :bigint(8) not null, primary key
|
||||
# status_id :bigint(8)
|
||||
# file_file_name :string
|
||||
# file_content_type :string
|
||||
# file_file_size :integer
|
||||
# file_file_size :bigint(8)
|
||||
# file_updated_at :datetime
|
||||
# remote_url :string default(""), not null
|
||||
# created_at :datetime not null
|
||||
@@ -16,6 +15,7 @@
|
||||
# type :integer default("image"), not null
|
||||
# file_meta :json
|
||||
# account_id :bigint(8)
|
||||
# id :bigint(8) not null, primary key
|
||||
# description :text
|
||||
# scheduled_status_id :bigint(8)
|
||||
# blurhash :string
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
# description :string default(""), not null
|
||||
# image_file_name :string
|
||||
# image_content_type :string
|
||||
# image_file_size :integer
|
||||
# image_file_size :bigint(8)
|
||||
# image_updated_at :datetime
|
||||
# type :integer default("link"), not null
|
||||
# html :text default(""), not null
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# var :string default(""), not null
|
||||
# file_file_name :string
|
||||
# file_content_type :string
|
||||
# file_file_size :integer
|
||||
# file_file_size :bigint(8)
|
||||
# file_updated_at :datetime
|
||||
# meta :json
|
||||
# created_at :datetime not null
|
||||
|
||||
Reference in New Issue
Block a user