Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka 2018-11-27 15:10:58 +01:00
commit 55edfd6e0e
6 changed files with 68 additions and 11 deletions

View file

@ -3,6 +3,40 @@ Changelog
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [2.6.2] - 2018-11-23
### Added
- Add Page to whitelisted ActivityPub types (#9188)
- Add 20px to column width in web UI (#9227)
- Add amount of freed disk space in `tootctl media remove` (#9229, #9239, #9288)
- Add "Show thread" link to self-replies (#9228)
### Changed
- Change order of Atom and RSS links so Atom is first (#9302)
- Change Nginx configuration for Nanobox apps (#9310)
- Change the follow action to appear instant in web UI (#9220)
- Change how the ActiveRecord connection is instantiated in on_worker_boot (#9238)
- Change `tootctl accounts cull` to always touch accounts so they can be skipped (#9293)
- Change mime type comparison to ignore JSON-LD profile (#9179)
### Fixed
- Fix web UI crash when conversation has no last status (#9207)
- Fix follow limit validator reporting lower number past threshold (#9230)
- Fix form validation flash message color and input borders (#9235)
- Fix invalid twitter:player cards being displayed (#9254)
- Fix emoji update date being processed incorrectly (#9255)
- Fix playing embed resetting if status is reloaded in web UI (#9270, #9275)
- Fix web UI crash when favouriting a deleted status (#9272)
- Fix intermediary arrays being created for hash maps (#9291)
- Fix filter ID not being a string in REST API (#9303)
### Security
- Fix multiple remote account deletions being able to deadlock the database (#9292)
- Fix HTTP connection timeout of 10s not being enforced (#9329)
## [2.6.1] - 2018-10-30 ## [2.6.1] - 2018-10-30
### Fixed ### Fixed

View file

@ -3,12 +3,12 @@
# #
# Table name: identities # Table name: identities
# #
# id :integer not null, primary key
# user_id :integer
# provider :string default(""), not null # provider :string default(""), not null
# uid :string default(""), not null # uid :string default(""), not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# id :bigint(8) not null, primary key
# user_id :bigint(8)
# #
class Identity < ApplicationRecord class Identity < ApplicationRecord

View file

@ -123,10 +123,6 @@ ms:
most_recent_ip: IP terbaru most_recent_ip: IP terbaru
no_limits_imposed: Tiada had dikuatkuasakan no_limits_imposed: Tiada had dikuatkuasakan
not_subscribed: Tiada langganan not_subscribed: Tiada langganan
order:
alphabetic: Ikut abjad
most_recent: Terbaru
title: Isihan
outbox_url: URL mesej keluar outbox_url: URL mesej keluar
perform_full_suspension: Gantung perform_full_suspension: Gantung
profile_url: URL profil profile_url: URL profil

View file

@ -0,0 +1,27 @@
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class IdentityIdToBigint < ActiveRecord::Migration[5.2]
include Mastodon::MigrationHelpers
disable_ddl_transaction!
def up
safety_assured do
change_column_type_concurrently :identities, :id, :bigint
cleanup_concurrent_column_type_change :identities, :id
change_column_type_concurrently :identities, :user_id, :bigint
cleanup_concurrent_column_type_change :identities, :user_id
end
end
def down
safety_assured do
change_column_type_concurrently :identities, :id, :integer
cleanup_concurrent_column_type_change :identities, :id
change_column_type_concurrently :identities, :user_id, :integer
cleanup_concurrent_column_type_change :identities, :user_id
end
end
end

View file

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2018_11_16_184611) do ActiveRecord::Schema.define(version: 2018_11_27_130500) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -245,12 +245,12 @@ ActiveRecord::Schema.define(version: 2018_11_16_184611) do
t.index ["target_account_id"], name: "index_follows_on_target_account_id" t.index ["target_account_id"], name: "index_follows_on_target_account_id"
end end
create_table "identities", id: :serial, force: :cascade do |t| create_table "identities", force: :cascade do |t|
t.integer "user_id"
t.string "provider", default: "", null: false t.string "provider", default: "", null: false
t.string "uid", default: "", null: false t.string "uid", default: "", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.bigint "user_id"
t.index ["user_id"], name: "index_identities_on_user_id" t.index ["user_id"], name: "index_identities_on_user_id"
end end
@ -664,7 +664,7 @@ ActiveRecord::Schema.define(version: 2018_11_16_184611) do
add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
add_foreign_key "identities", "users", on_delete: :cascade add_foreign_key "identities", "users", name: "fk_bea040f377", on_delete: :cascade
add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
add_foreign_key "invites", "users", on_delete: :cascade add_foreign_key "invites", "users", on_delete: :cascade
add_foreign_key "list_accounts", "accounts", on_delete: :cascade add_foreign_key "list_accounts", "accounts", on_delete: :cascade

View file

@ -13,7 +13,7 @@ module Mastodon
end end
def patch def patch
1 2
end end
def pre def pre