diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-17 17:43:54 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-17 17:43:54 +0200 |
commit | 280d7b1df8566239f15130d8bf1e0e2c1d467fc0 (patch) | |
tree | 7903e071b0013fb15dcc5a74f6143239dcbaa2c2 /db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb | |
parent | 4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff) | |
parent | 59f7f4c923494bb8dd6f2881a1610c7b51240d9c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).
Diffstat (limited to 'db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb')
-rw-r--r-- | db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb new file mode 100644 index 000000000..7077a4e65 --- /dev/null +++ b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb @@ -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 |