@@ -41,7 +41,7 @@ gem 'omniauth-cas', '~> 1.1' | |||||
gem 'omniauth-saml', '~> 1.10' | gem 'omniauth-saml', '~> 1.10' | ||||
gem 'omniauth', '~> 1.2' | gem 'omniauth', '~> 1.2' | ||||
gem 'doorkeeper', '~> 4.2', '< 4.3' | |||||
gem 'doorkeeper', '~> 4.4' | |||||
gem 'fast_blank', '~> 1.0' | gem 'fast_blank', '~> 1.0' | ||||
gem 'fastimage' | gem 'fastimage' | ||||
gem 'goldfinger', '~> 2.1' | gem 'goldfinger', '~> 2.1' | ||||
@@ -181,7 +181,7 @@ GEM | |||||
docile (1.3.0) | docile (1.3.0) | ||||
domain_name (0.5.20180417) | domain_name (0.5.20180417) | ||||
unf (>= 0.0.5, < 1.0.0) | unf (>= 0.0.5, < 1.0.0) | ||||
doorkeeper (4.2.6) | |||||
doorkeeper (4.4.1) | |||||
railties (>= 4.2) | railties (>= 4.2) | ||||
dotenv (2.2.2) | dotenv (2.2.2) | ||||
dotenv-rails (2.2.2) | dotenv-rails (2.2.2) | ||||
@@ -670,7 +670,7 @@ DEPENDENCIES | |||||
devise (~> 4.4) | devise (~> 4.4) | ||||
devise-two-factor (~> 3.0) | devise-two-factor (~> 3.0) | ||||
devise_pam_authenticatable2 (~> 9.1) | devise_pam_authenticatable2 (~> 9.1) | ||||
doorkeeper (~> 4.2, < 4.3) | |||||
doorkeeper (~> 4.4) | |||||
dotenv-rails (~> 2.2, < 2.3) | dotenv-rails (~> 2.2, < 2.3) | ||||
fabrication (~> 2.20) | fabrication (~> 2.20) | ||||
faker (~> 1.8) | faker (~> 1.8) | ||||
@@ -1,5 +1,3 @@ | |||||
require Rails.root.join('lib', 'mastodon', 'migration_helpers') | |||||
class ChangeAccountIdNonnullableInLists < ActiveRecord::Migration[5.1] | class ChangeAccountIdNonnullableInLists < ActiveRecord::Migration[5.1] | ||||
def change | def change | ||||
change_column_null :lists, :account_id, false | change_column_null :lists, :account_id, false | ||||
@@ -0,0 +1,23 @@ | |||||
require Rails.root.join('lib', 'mastodon', 'migration_helpers') | |||||
class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.2] | |||||
include Mastodon::MigrationHelpers | |||||
disable_ddl_transaction! | |||||
def up | |||||
safety_assured do | |||||
add_column_with_default( | |||||
:oauth_applications, | |||||
:confidential, | |||||
:boolean, | |||||
allow_null: false, | |||||
default: true # maintaining backwards compatibility: require secrets | |||||
) | |||||
end | |||||
end | |||||
def down | |||||
remove_column :oauth_applications, :confidential | |||||
end | |||||
end |
@@ -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_07_07_154237) do | |||||
ActiveRecord::Schema.define(version: 2018_08_14_171349) 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" | ||||
@@ -339,6 +339,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do | |||||
t.string "website" | t.string "website" | ||||
t.string "owner_type" | t.string "owner_type" | ||||
t.bigint "owner_id" | t.bigint "owner_id" | ||||
t.boolean "confidential", default: true, null: false | |||||
t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type" | t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type" | ||||
t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true | t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true | ||||
end | end | ||||