Merge branch 'gabsocial' into 'master'

gabsocial --> soapbox paths See merge request soapbox-pub/soapbox-fe!34
2020-05-28 23:12:47 +00:00 · 2020-05-28 23:12:47 +00:00 · 14f673cf7f
commit 14f673cf7f
parent 010638cd9b d24dcb3e60
609 changed files with 195 additions and 195 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
--- a/.sass-lint.yml
+++ b/.sass-lint.yml
@ -4,7 +4,7 @@
 files:
  include: app/styles/**/*.scss
  ignore:
-    - app/styles/gabsocial/reset.scss
+    - app/styles/soapbox/reset.scss

 rules:
  # Disallows
--- a/app/index.ejs
+++ b/app/index.ejs
@ -22,6 +22,6 @@
  </head>
  <body class="app-body">
    <noscript>To use Soapbox, please enable JavaScript.</noscript>
-    <div class="app-holder" id="gabsocial"></div>
+    <div class="app-holder" id="soapbox"></div>
  </body>
 </html>
--- a/app/packs/about.js
+++ b/app/packs/about.js
--- a/app/packs/application.js
+++ b/app/packs/application.js
--- a/app/packs/public.js
+++ b/app/packs/public.js
--- a/app/packs/share.js
+++ b/app/packs/share.js
--- a/app/gabsocial/actions/about.js
+++ b/app/gabsocial/actions/about.js
--- a/app/gabsocial/actions/accounts.js
+++ b/app/gabsocial/actions/accounts.js
--- a/app/gabsocial/actions/alerts.js
+++ b/app/gabsocial/actions/alerts.js
--- a/app/gabsocial/actions/auth.js
+++ b/app/gabsocial/actions/auth.js
--- a/app/gabsocial/actions/blocks.js
+++ b/app/gabsocial/actions/blocks.js
--- a/app/gabsocial/actions/bundles.js
+++ b/app/gabsocial/actions/bundles.js
--- a/app/gabsocial/actions/compose.js
+++ b/app/gabsocial/actions/compose.js
--- a/app/gabsocial/actions/conversations.js
+++ b/app/gabsocial/actions/conversations.js
--- a/app/gabsocial/actions/custom_emojis.js
+++ b/app/gabsocial/actions/custom_emojis.js
--- a/app/gabsocial/actions/domain_blocks.js
+++ b/app/gabsocial/actions/domain_blocks.js
--- a/app/gabsocial/actions/dropdown_menu.js
+++ b/app/gabsocial/actions/dropdown_menu.js
--- a/app/gabsocial/actions/emoji_reacts.js
+++ b/app/gabsocial/actions/emoji_reacts.js
--- a/app/gabsocial/actions/emojis.js
+++ b/app/gabsocial/actions/emojis.js
--- a/app/gabsocial/actions/favourites.js
+++ b/app/gabsocial/actions/favourites.js
--- a/app/gabsocial/actions/filters.js
+++ b/app/gabsocial/actions/filters.js
--- a/app/gabsocial/actions/group_editor.js
+++ b/app/gabsocial/actions/group_editor.js
--- a/app/gabsocial/actions/groups.js
+++ b/app/gabsocial/actions/groups.js
--- a/app/gabsocial/actions/height_cache.js
+++ b/app/gabsocial/actions/height_cache.js
--- a/app/gabsocial/actions/identity_proofs.js
+++ b/app/gabsocial/actions/identity_proofs.js
--- a/app/gabsocial/actions/importer/index.js
+++ b/app/gabsocial/actions/importer/index.js
--- a/app/gabsocial/actions/importer/normalizer.js
+++ b/app/gabsocial/actions/importer/normalizer.js
--- a/app/gabsocial/actions/instance.js
+++ b/app/gabsocial/actions/instance.js
--- a/app/gabsocial/actions/interactions.js
+++ b/app/gabsocial/actions/interactions.js
--- a/app/gabsocial/actions/lists.js
+++ b/app/gabsocial/actions/lists.js
--- a/app/gabsocial/actions/markers.js
+++ b/app/gabsocial/actions/markers.js
--- a/app/gabsocial/actions/me.js
+++ b/app/gabsocial/actions/me.js
--- a/app/gabsocial/actions/modal.js
+++ b/app/gabsocial/actions/modal.js
--- a/app/gabsocial/actions/mutes.js
+++ b/app/gabsocial/actions/mutes.js
--- a/app/gabsocial/actions/notifications.js
+++ b/app/gabsocial/actions/notifications.js
--- a/app/gabsocial/actions/onboarding.js
+++ b/app/gabsocial/actions/onboarding.js
--- a/app/gabsocial/actions/patron.js
+++ b/app/gabsocial/actions/patron.js
--- a/app/gabsocial/actions/pin_statuses.js
+++ b/app/gabsocial/actions/pin_statuses.js
--- a/app/gabsocial/actions/polls.js
+++ b/app/gabsocial/actions/polls.js
--- a/app/gabsocial/actions/push_notifications/index.js
+++ b/app/gabsocial/actions/push_notifications/index.js
--- a/app/gabsocial/actions/push_notifications/registerer.js
+++ b/app/gabsocial/actions/push_notifications/registerer.js
--- a/app/gabsocial/actions/push_notifications/setter.js
+++ b/app/gabsocial/actions/push_notifications/setter.js
--- a/app/gabsocial/actions/reports.js
+++ b/app/gabsocial/actions/reports.js
--- a/app/gabsocial/actions/search.js
+++ b/app/gabsocial/actions/search.js
--- a/app/gabsocial/actions/settings.js
+++ b/app/gabsocial/actions/settings.js
--- a/app/gabsocial/actions/sidebar.js
+++ b/app/gabsocial/actions/sidebar.js
--- a/app/gabsocial/actions/soapbox.js
+++ b/app/gabsocial/actions/soapbox.js
--- a/app/gabsocial/actions/statuses.js
+++ b/app/gabsocial/actions/statuses.js
--- a/app/gabsocial/actions/store.js
+++ b/app/gabsocial/actions/store.js
--- a/app/gabsocial/actions/streaming.js
+++ b/app/gabsocial/actions/streaming.js
--- a/app/gabsocial/actions/suggestions.js
+++ b/app/gabsocial/actions/suggestions.js
--- a/app/gabsocial/actions/timelines.js
+++ b/app/gabsocial/actions/timelines.js
--- a/app/gabsocial/actions/trends.js
+++ b/app/gabsocial/actions/trends.js
--- a/app/gabsocial/api.js
+++ b/app/gabsocial/api.js
--- a/app/gabsocial/base_polyfills.js
+++ b/app/gabsocial/base_polyfills.js
--- a/app/gabsocial/common.js
+++ b/app/gabsocial/common.js
--- a/app/gabsocial/compare_id.js
+++ b/app/gabsocial/compare_id.js
--- a/app/gabsocial/components/tests/snapshots/autosuggest_emoji-test.js.snap
+++ b/app/gabsocial/components/tests/snapshots/autosuggest_emoji-test.js.snap
--- a/app/gabsocial/components/tests/snapshots/avatar-test.js.snap
+++ b/app/gabsocial/components/tests/snapshots/avatar-test.js.snap
--- a/app/gabsocial/components/tests/snapshots/avatar_overlay-test.js.snap
+++ b/app/gabsocial/components/tests/snapshots/avatar_overlay-test.js.snap
--- a/app/gabsocial/components/tests/snapshots/button-test.js.snap
+++ b/app/gabsocial/components/tests/snapshots/button-test.js.snap
--- a/app/gabsocial/components/tests/snapshots/display_name-test.js.snap
+++ b/app/gabsocial/components/tests/snapshots/display_name-test.js.snap
--- a/app/gabsocial/components/tests/autosuggest_emoji-test.js
+++ b/app/gabsocial/components/tests/autosuggest_emoji-test.js
--- a/app/gabsocial/components/tests/avatar-test.js
+++ b/app/gabsocial/components/tests/avatar-test.js
--- a/app/gabsocial/components/tests/avatar_overlay-test.js
+++ b/app/gabsocial/components/tests/avatar_overlay-test.js
--- a/app/gabsocial/components/tests/button-test.js
+++ b/app/gabsocial/components/tests/button-test.js
--- a/app/gabsocial/components/tests/display_name-test.js
+++ b/app/gabsocial/components/tests/display_name-test.js
--- a/app/gabsocial/components/account.js
+++ b/app/gabsocial/components/account.js
--- a/app/gabsocial/components/attachment_list.js
+++ b/app/gabsocial/components/attachment_list.js
--- a/app/gabsocial/components/autosuggest_emoji.js
+++ b/app/gabsocial/components/autosuggest_emoji.js
--- a/app/gabsocial/components/autosuggest_input.js
+++ b/app/gabsocial/components/autosuggest_input.js
--- a/app/gabsocial/components/autosuggest_textarea.js
+++ b/app/gabsocial/components/autosuggest_textarea.js
--- a/app/gabsocial/components/avatar.js
+++ b/app/gabsocial/components/avatar.js
--- a/app/gabsocial/components/avatar_composite.js
+++ b/app/gabsocial/components/avatar_composite.js
--- a/app/gabsocial/components/avatar_overlay.js
+++ b/app/gabsocial/components/avatar_overlay.js
--- a/app/gabsocial/components/badge.js
+++ b/app/gabsocial/components/badge.js
--- a/app/gabsocial/components/button.js
+++ b/app/gabsocial/components/button.js
--- a/app/gabsocial/components/column.js
+++ b/app/gabsocial/components/column.js
--- a/app/gabsocial/components/column_back_button.js
+++ b/app/gabsocial/components/column_back_button.js
--- a/app/gabsocial/components/column_back_button_slim.js
+++ b/app/gabsocial/components/column_back_button_slim.js
--- a/app/gabsocial/components/column_header.js
+++ b/app/gabsocial/components/column_header.js
--- a/app/gabsocial/components/display_name.js
+++ b/app/gabsocial/components/display_name.js
--- a/app/gabsocial/components/domain.js
+++ b/app/gabsocial/components/domain.js
--- a/app/gabsocial/components/donor_badge.js
+++ b/app/gabsocial/components/donor_badge.js
--- a/app/gabsocial/components/dropdown_menu.js
+++ b/app/gabsocial/components/dropdown_menu.js
--- a/app/gabsocial/components/emoji_selector.js
+++ b/app/gabsocial/components/emoji_selector.js
--- a/app/gabsocial/components/error_boundary.js
+++ b/app/gabsocial/components/error_boundary.js
--- a/app/gabsocial/components/extended_video_player.js
+++ b/app/gabsocial/components/extended_video_player.js
--- a/app/gabsocial/components/hashtag.js
+++ b/app/gabsocial/components/hashtag.js
--- a/app/gabsocial/components/helmet.js
+++ b/app/gabsocial/components/helmet.js
--- a/app/gabsocial/components/home_column_header.js
+++ b/app/gabsocial/components/home_column_header.js
--- a/app/gabsocial/components/icon.js
+++ b/app/gabsocial/components/icon.js
--- a/app/gabsocial/components/icon_button.js
+++ b/app/gabsocial/components/icon_button.js
--- a/app/gabsocial/components/icon_with_badge.js
+++ b/app/gabsocial/components/icon_with_badge.js
--- a/app/gabsocial/components/intersection_observer_article.js
+++ b/app/gabsocial/components/intersection_observer_article.js
--- a/app/gabsocial/components/investor_badge.js
+++ b/app/gabsocial/components/investor_badge.js
--- a/app/gabsocial/components/load_gap.js
+++ b/app/gabsocial/components/load_gap.js
--- a/app/gabsocial/components/load_more.js
+++ b/app/gabsocial/components/load_more.js
--- a/app/gabsocial/components/loading_indicator.js
+++ b/app/gabsocial/components/loading_indicator.js
--- a/Show more
+++ b/Show more