Conflicts: - `app/views/admin/trends/links/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/links/preview_card_providers/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/statuses/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes. - `app/views/admin/trends/tags/index.html.haml`: Not really a conflict, upstream change textually too close to a glitch-soc change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming system). Ported upstream changes.th-downstream
commit
3e3fc8398b
@ -1,5 +1,5 @@
|
|||||||
Fabricator(:rule) do
|
Fabricator(:rule) do
|
||||||
priority ""
|
priority 0
|
||||||
deleted_at "2021-02-21 05:51:09"
|
deleted_at nil
|
||||||
text "MyText"
|
text { Faker::Lorem.paragraph }
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in new issue