01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
21 lines
613 B
Ruby
21 lines
613 B
Ruby
# This migration is a duplicate of 20180410220657 and may get ignored, see
|
|
# config/initializers/0_duplicate_migrations.rb
|
|
|
|
class CreateBookmarks < ActiveRecord::Migration[5.2]
|
|
def change
|
|
create_table :bookmarks do |t|
|
|
t.references :account, null: false
|
|
t.references :status, null: false
|
|
|
|
t.timestamps
|
|
end
|
|
|
|
safety_assured do
|
|
add_foreign_key :bookmarks, :accounts, column: :account_id, on_delete: :cascade
|
|
add_foreign_key :bookmarks, :statuses, column: :status_id, on_delete: :cascade
|
|
end
|
|
|
|
add_index :bookmarks, [:account_id, :status_id], unique: true
|
|
end
|
|
end
|