Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file. |
||
|---|---|---|
| .. | ||
| base.rb | ||
| history.rb | ||
| links.rb | ||
| preview_card_batch.rb | ||
| preview_card_filter.rb | ||
| preview_card_provider_batch.rb | ||
| preview_card_provider_filter.rb | ||
| query.rb | ||
| status_batch.rb | ||
| status_filter.rb | ||
| statuses.rb | ||
| tag_batch.rb | ||
| tag_filter.rb | ||
| tags.rb | ||