$ git status
On branch master
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: .babelrc
modified: .dockerignore
modified: .env.nanobox
modified: .env.production.sample
modified: .eslintrc.yml
modified: .nanoignore
modified: .rubocop.yml
modified: .slugignore
modified: .travis.yml
modified: Aptfile
new file: CODEOWNERS
modified: Dockerfile
modified: Gemfile
modified: Gemfile.lock
modified: README.md
modified: Vagrantfile
modified: app.json
modified: app/controllers/about_controller.rb
modified: app/controllers/accounts_controller.rb
new file: app/controllers/activitypub/inboxes_controller.rb
new file: app/controllers/activitypub/outboxes_controller.rb
modified: app/controllers/admin/accounts_controller.rb
modified: app/controllers/admin/instances_controller.rb
modified: app/controllers/admin/scheduled_statuses_controller.rb
modified: app/controllers/admin/settings_controller.rb
modified: app/controllers/admin/statuses_controller.rb
deleted: app/controllers/api/activitypub/activities_controller.rb
deleted: app/controllers/api/activitypub/notes_controller.rb
deleted: app/controllers/api/activitypub/outbox_controller.rb
modified: app/controllers/api/base_controller.rb
modified: app/controllers/api/oembed_controller.rb
modified: app/controllers/api/v1/accounts/credentials_controller.rb
modified: app/controllers/api/v1/accounts/follower_accounts_controller.rb
modified: app/controllers/api/v1/accounts/following_accounts_controller.rb
modified: app/controllers/api/v1/accounts/relationships_controller.rb
modified: app/controllers/api/v1/accounts/search_controller.rb
modified: app/controllers/api/v1/accounts/statuses_controller.rb
modified: app/controllers/api/v1/accounts_controller.rb
modified: app/controllers/api/v1/apps_controller.rb
modified: app/controllers/api/v1/blocks_controller.rb
modified: app/controllers/api/v1/favourites_controller.rb
modified: app/controllers/api/v1/follow_requests_controller.rb
modified: app/controllers/api/v1/follows_controller.rb
modified: app/controllers/api/v1/instances_controller.rb
modified: app/controllers/api/v1/media_controller.rb
modified: app/controllers/api/v1/mutes_controller.rb
modified: app/controllers/api/v1/notifications_controller.rb
modified: app/controllers/api/v1/reports_controller.rb
modified: app/controllers/api/v1/search_controller.rb
modified: app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
modified: app/controllers/api/v1/statuses/favourites_controller.rb
modified: app/controllers/api/v1/statuses/mutes_controller.rb
new file: app/controllers/api/v1/statuses/pins_controller.rb
modified: app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
modified: app/controllers/api/v1/statuses/reblogs_controller.rb
modified: app/controllers/api/v1/statuses_controller.rb
modified: app/controllers/api/v1/timelines/home_controller.rb
modified: app/controllers/api/v1/timelines/public_controller.rb
modified: app/controllers/api/v1/timelines/tag_controller.rb
new file: app/controllers/api/web/embeds_controller.rb
new file: app/controllers/api/web/push_subscriptions_controller.rb
modified: app/controllers/application_controller.rb
modified: app/controllers/auth/confirmations_controller.rb
modified: app/controllers/auth/passwords_controller.rb
modified: app/controllers/authorize_follows_controller.rb
modified: app/controllers/concerns/account_controller_concern.rb
new file: app/controllers/concerns/home_concern.rb
modified: app/controllers/concerns/signature_verification.rb
modified: app/controllers/follower_accounts_controller.rb
modified: app/controllers/following_accounts_controller.rb
deleted: app/controllers/home_concern.rb
modified: app/controllers/home_controller.rb
modified: app/controllers/intent/statuses_controller.rb
new file: app/controllers/intents_controller.rb
modified: app/controllers/remote_follow_controller.rb
new file: app/controllers/settings/applications_controller.rb
modified: app/controllers/settings/preferences_controller.rb
modified: app/controllers/settings/profiles_controller.rb
new file: app/controllers/settings/sessions_controller.rb
modified: app/controllers/settings/two_factor_authentications_controller.rb
new file: app/controllers/shares_controller.rb
modified: app/controllers/statuses_controller.rb
modified: app/controllers/stream_entries_controller.rb
modified: app/controllers/tags_controller.rb
deleted: app/helpers/activitystreams2_builder_helper.rb
modified: app/helpers/admin/filter_helper.rb
modified: app/helpers/application_helper.rb
new file: app/helpers/emoji_helper.rb
modified: app/helpers/instance_helper.rb
new file: app/helpers/jsonld_helper.rb
modified: app/helpers/routing_helper.rb
modified: app/helpers/settings_helper.rb
modified: app/helpers/stream_entries_helper.rb
new file: app/javascript/fonts/montserrat/Montserrat-Medium.ttf
deleted: app/javascript/images/background-photo.jpg
deleted: app/javascript/images/boost_sprite.png
new file: app/javascript/images/elephant-fren.png
deleted: app/javascript/images/fluffy-elephant-friend.png
deleted: app/javascript/images/logo.png
modified: app/javascript/images/logo.svg
new file: app/javascript/images/logo_alt.svg
new file: app/javascript/images/logo_full.svg
deleted: app/javascript/images/mastodon.jpg
new file: app/javascript/mastodon/actions/bundles.js
modified: app/javascript/mastodon/actions/interactions.js
modified: app/javascript/mastodon/actions/notifications.js
new file: app/javascript/mastodon/actions/pin_statuses.js
new file: app/javascript/mastodon/actions/push_notifications.js
modified: app/javascript/mastodon/actions/store.js
new file: app/javascript/mastodon/actions/streaming.js
modified: app/javascript/mastodon/actions/timelines.js
modified: app/javascript/mastodon/components/account.js
modified: app/javascript/mastodon/components/autosuggest_textarea.js
modified: app/javascript/mastodon/components/avatar.js
modified: app/javascript/mastodon/components/avatar_overlay.js
modified: app/javascript/mastodon/components/column.js
modified: app/javascript/mastodon/components/column_back_button.js
modified: app/javascript/mastodon/components/display_name.js
modified: app/javascript/mastodon/components/dropdown_menu.js
modified: app/javascript/mastodon/components/extended_video_player.js
modified: app/javascript/mastodon/components/icon_button.js
new file: app/javascript/mastodon/components/intersection_observer_article.js
modified: app/javascript/mastodon/components/load_more.js
modified: app/javascript/mastodon/components/loading_indicator.js
modified: app/javascript/mastodon/components/permalink.js
new file: app/javascript/mastodon/components/scrollable_list.js
modified: app/javascript/mastodon/components/setting_text.js
modified: app/javascript/mastodon/components/status_content.js
modified: app/javascript/mastodon/components/video_player.js
modified: app/javascript/mastodon/containers/account_container.js
new file: app/javascript/mastodon/containers/compose_container.js
new file: app/javascript/mastodon/containers/dropdown_menu_container.js
new file: app/javascript/mastodon/containers/timeline_container.js
modified: app/javascript/mastodon/emoji.js
new file: app/javascript/mastodon/emojione_light.js
modified: app/javascript/mastodon/features/account/components/header.js
modified: app/javascript/mastodon/features/account_timeline/containers/header_container.js
modified: app/javascript/mastodon/features/account_timeline/index.js
modified: app/javascript/mastodon/features/compose/components/autosuggest_account.js
modified: app/javascript/mastodon/features/compose/components/character_counter.js
modified: app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
modified: app/javascript/mastodon/features/compose/components/navigation_bar.js
modified: app/javascript/mastodon/features/compose/components/privacy_dropdown.js
modified: app/javascript/mastodon/features/compose/components/reply_indicator.js
modified: app/javascript/mastodon/features/compose/components/search.js
modified: app/javascript/mastodon/features/compose/components/upload_button.js
modified: app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
modified: app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
new file: app/javascript/mastodon/features/compose/util/counter.js
modified: app/javascript/mastodon/features/favourited_statuses/index.js
modified: app/javascript/mastodon/features/follow_requests/components/account_authorize.js
modified: app/javascript/mastodon/features/hashtag_timeline/index.js
modified: app/javascript/mastodon/features/notifications/components/column_settings.js
modified: app/javascript/mastodon/features/notifications/components/notification.js
modified: app/javascript/mastodon/features/notifications/components/setting_toggle.js
modified: app/javascript/mastodon/features/notifications/containers/column_settings_container.js
modified: app/javascript/mastodon/features/notifications/index.js
new file: app/javascript/mastodon/features/pinned_statuses/index.js
modified: app/javascript/mastodon/features/public_timeline/index.js
modified: app/javascript/mastodon/features/report/components/status_check_box.js
modified: app/javascript/mastodon/features/report/containers/status_check_box_container.js
new file: app/javascript/mastodon/features/standalone/compose/index.js
new file: app/javascript/mastodon/features/standalone/public_timeline/index.js
modified: app/javascript/mastodon/features/status/components/action_bar.js
modified: app/javascript/mastodon/features/status/components/card.js
modified: app/javascript/mastodon/features/status/components/detailed_status.js
modified: app/javascript/mastodon/features/status/index.js
new file: app/javascript/mastodon/features/ui/components/actions_modal.js
modified: app/javascript/mastodon/features/ui/components/boost_modal.js
new file: app/javascript/mastodon/features/ui/components/bundle.js
new file: app/javascript/mastodon/features/ui/components/bundle_column_error.js
new file: app/javascript/mastodon/features/ui/components/bundle_modal_error.js
modified: app/javascript/mastodon/features/ui/components/column_header.js
modified: app/javascript/mastodon/features/ui/components/column_link.js
new file: app/javascript/mastodon/features/ui/components/column_loading.js
new file: app/javascript/mastodon/features/ui/components/drawer_loading.js
new file: app/javascript/mastodon/features/ui/components/embed_modal.js
modified: app/javascript/mastodon/features/ui/components/media_modal.js
new file: app/javascript/mastodon/features/ui/components/modal_loading.js
modified: app/javascript/mastodon/features/ui/components/onboarding_modal.js
modified: app/javascript/mastodon/features/ui/components/upload_area.js
new file: app/javascript/mastodon/features/ui/containers/bundle_container.js
modified: app/javascript/mastodon/features/ui/containers/columns_area_container.js
modified: app/javascript/mastodon/features/ui/containers/status_list_container.js
new file: app/javascript/mastodon/features/ui/util/async-components.js
new file: app/javascript/mastodon/features/ui/util/get_rect_from_entry.js
modified: app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
new file: app/javascript/mastodon/features/ui/util/react_router_helpers.js
modified: app/javascript/mastodon/is_mobile.js
modified: app/javascript/mastodon/locales/ar.json
modified: app/javascript/mastodon/locales/bg.json
modified: app/javascript/mastodon/locales/ca.json
modified: app/javascript/mastodon/locales/de.json
modified: app/javascript/mastodon/locales/defaultMessages.json
modified: app/javascript/mastodon/locales/eo.json
modified: app/javascript/mastodon/locales/es.json
modified: app/javascript/mastodon/locales/fa.json
modified: app/javascript/mastodon/locales/fi.json
modified: app/javascript/mastodon/locales/fr.json
modified: app/javascript/mastodon/locales/he.json
modified: app/javascript/mastodon/locales/hr.json
modified: app/javascript/mastodon/locales/hu.json
modified: app/javascript/mastodon/locales/id.json
modified: app/javascript/mastodon/locales/io.json
modified: app/javascript/mastodon/locales/it.json
new file: app/javascript/mastodon/locales/ko.json
modified: app/javascript/mastodon/locales/nl.json
modified: app/javascript/mastodon/locales/no.json
modified: app/javascript/mastodon/locales/oc.json
modified: app/javascript/mastodon/locales/pl.json
modified: app/javascript/mastodon/locales/pt-BR.json
modified: app/javascript/mastodon/locales/pt.json
modified: app/javascript/mastodon/locales/ru.json
modified: app/javascript/mastodon/locales/th.json
modified: app/javascript/mastodon/locales/tr.json
modified: app/javascript/mastodon/locales/uk.json
new file: app/javascript/mastodon/locales/whitelist_ko.json
modified: app/javascript/mastodon/locales/whitelist_zh-HK.json
modified: app/javascript/mastodon/locales/zh-CN.json
modified: app/javascript/mastodon/locales/zh-HK.json
modified: app/javascript/mastodon/locales/zh-TW.json
modified: app/javascript/mastodon/main.js
new file: app/javascript/mastodon/ready.js
modified: app/javascript/mastodon/reducers/accounts.js
modified: app/javascript/mastodon/reducers/accounts_counters.js
modified: app/javascript/mastodon/reducers/alerts.js
modified: app/javascript/mastodon/reducers/cards.js
modified: app/javascript/mastodon/reducers/contexts.js
modified: app/javascript/mastodon/reducers/media_attachments.js
modified: app/javascript/mastodon/reducers/meta.js
modified: app/javascript/mastodon/reducers/notifications.js
new file: app/javascript/mastodon/reducers/push_notifications.js
modified: app/javascript/mastodon/reducers/relationships.js
modified: app/javascript/mastodon/reducers/reports.js
modified: app/javascript/mastodon/reducers/search.js
modified: app/javascript/mastodon/reducers/settings.js
modified: app/javascript/mastodon/scroll.js
modified: app/javascript/mastodon/selectors/index.js
new file: app/javascript/mastodon/service_worker/entry.js
new file: app/javascript/mastodon/service_worker/web_push_notifications.js
new file: app/javascript/mastodon/web_push_subscription.js
new file: app/javascript/packs/about.js
modified: app/javascript/packs/application.js
modified: app/javascript/packs/common.js
new file: app/javascript/packs/share.js
modified: app/javascript/styles/boost.scss
modified: app/javascript/styles/containers.scss
modified: app/javascript/styles/fonts/montserrat.scss
modified: app/javascript/styles/forms.scss
modified: app/javascript/styles/stream_entries.scss
modified: app/javascript/styles/tables.scss
modified: app/javascript/styles/variables.scss
new file: app/lib/activitypub/activity.rb
new file: app/lib/activitypub/activity/accept.rb
new file: app/lib/activitypub/activity/announce.rb
new file: app/lib/activitypub/activity/block.rb
new file: app/lib/activitypub/activity/create.rb
new file: app/lib/activitypub/activity/delete.rb
new file: app/lib/activitypub/activity/follow.rb
new file: app/lib/activitypub/activity/like.rb
new file: app/lib/activitypub/activity/reject.rb
new file: app/lib/activitypub/activity/undo.rb
new file: app/lib/activitypub/activity/update.rb
new file: app/lib/activitypub/adapter.rb
new file: app/lib/activitypub/case_transform.rb
new file: app/lib/activitypub/linked_data_signature.rb
new file: app/lib/activitypub/tag_manager.rb
deleted: app/lib/atom_serializer.rb
new file: app/lib/emoji.rb
modified: app/lib/exceptions.rb
modified: app/lib/feed_manager.rb
modified: app/lib/formatter.rb
deleted: app/lib/inline_rabl_scope.rb
modified: app/lib/inline_renderer.rb
modified: app/lib/language_detector.rb
new file: app/lib/ostatus/activity/base.rb
new file: app/lib/ostatus/activity/creation.rb
new file: app/lib/ostatus/activity/deletion.rb
new file: app/lib/ostatus/activity/general.rb
new file: app/lib/ostatus/activity/post.rb
new file: app/lib/ostatus/activity/remote.rb
new file: app/lib/ostatus/activity/share.rb
new file: app/lib/ostatus/atom_serializer.rb
modified: app/lib/request.rb
new file: app/lib/status_finder.rb
deleted: app/lib/stream_entry_finder.rb
modified: app/lib/tag_manager.rb
modified: app/lib/user_settings_decorator.rb
modified: app/mailers/application_mailer.rb
modified: app/mailers/user_mailer.rb
modified: app/models/account.rb
modified: app/models/concerns/account_avatar.rb
modified: app/models/concerns/account_header.rb
modified: app/models/concerns/account_interactions.rb
modified: app/models/concerns/remotable.rb
new file: app/models/context.rb
modified: app/models/domain_block.rb
modified: app/models/feed.rb
new file: app/models/form/admin_settings.rb
modified: app/models/import.rb
modified: app/models/media_attachment.rb
modified: app/models/preview_card.rb
modified: app/models/report.rb
new file: app/models/search.rb
modified: app/models/session_activation.rb
modified: app/models/status.rb
new file: app/models/status_pin.rb
modified: app/models/tag.rb
modified: app/models/user.rb
new file: app/models/web/push_subscription.rb
new file: app/presenters/account_relationships_presenter.rb
new file: app/presenters/activitypub/collection_presenter.rb
new file: app/presenters/initial_state_presenter.rb
modified: app/presenters/instance_presenter.rb
new file: app/presenters/status_relationships_presenter.rb
new file: app/serializers/activitypub/accept_follow_serializer.rb
new file: app/serializers/activitypub/activity_serializer.rb
new file: app/serializers/activitypub/actor_serializer.rb
new file: app/serializers/activitypub/block_serializer.rb
new file: app/serializers/activitypub/collection_serializer.rb
new file: app/serializers/activitypub/delete_serializer.rb
new file: app/serializers/activitypub/follow_serializer.rb
new file: app/serializers/activitypub/like_serializer.rb
new file: app/serializers/activitypub/note_serializer.rb
new file: app/serializers/activitypub/public_key_serializer.rb
new file: app/serializers/activitypub/reject_follow_serializer.rb
new file: app/serializers/activitypub/undo_announce_serializer.rb
new file: app/serializers/activitypub/undo_block_serializer.rb
new file: app/serializers/activitypub/undo_follow_serializer.rb
new file: app/serializers/activitypub/undo_like_serializer.rb
new file: app/serializers/activitypub/update_serializer.rb
new file: app/serializers/initial_state_serializer.rb
new file: app/serializers/oembed_serializer.rb
new file: app/serializers/rest/account_serializer.rb
new file: app/serializers/rest/application_serializer.rb
new file: app/serializers/rest/context_serializer.rb
new file: app/serializers/rest/credential_account_serializer.rb
new file: app/serializers/rest/instance_serializer.rb
new file: app/serializers/rest/media_attachment_serializer.rb
new file: app/serializers/rest/notification_serializer.rb
new file: app/serializers/rest/preview_card_serializer.rb
new file: app/serializers/rest/relationship_serializer.rb
new file: app/serializers/rest/report_serializer.rb
new file: app/serializers/rest/search_serializer.rb
new file: app/serializers/rest/status_serializer.rb
new file: app/serializers/web/notification_serializer.rb
modified: app/services/account_search_service.rb
new file: app/services/activitypub/fetch_remote_account_service.rb
new file: app/services/activitypub/fetch_remote_key_service.rb
new file: app/services/activitypub/fetch_remote_status_service.rb
new file: app/services/activitypub/process_account_service.rb
new file: app/services/activitypub/process_collection_service.rb
modified: app/services/authorize_follow_service.rb
modified: app/services/batched_remove_status_service.rb
modified: app/services/block_domain_service.rb
modified: app/services/block_service.rb
new file: app/services/bootstrap_timeline_service.rb
modified: app/services/concerns/author_extractor.rb
modified: app/services/concerns/stream_entry_renderer.rb
modified: app/services/fan_out_on_write_service.rb
modified: app/services/favourite_service.rb
modified: app/services/fetch_atom_service.rb
modified: app/services/fetch_link_card_service.rb
modified: app/services/fetch_remote_account_service.rb
modified: app/services/fetch_remote_resource_service.rb
modified: app/services/fetch_remote_status_service.rb
modified: app/services/follow_service.rb
modified: app/services/notify_service.rb
modified: app/services/post_status_service.rb
modified: app/services/process_feed_service.rb
modified: app/services/process_interaction_service.rb
modified: app/services/process_mentions_service.rb
modified: app/services/reblog_service.rb
modified: app/services/reject_follow_service.rb
modified: app/services/remove_status_service.rb
modified: app/services/resolve_remote_account_service.rb
modified: app/services/send_interaction_service.rb
modified: app/services/subscribe_service.rb
modified: app/services/unblock_domain_service.rb
modified: app/services/unblock_service.rb
modified: app/services/unfavourite_service.rb
modified: app/services/unfollow_service.rb
modified: app/services/unsubscribe_service.rb
new file: app/services/update_account_service.rb
modified: app/validators/status_length_validator.rb
new file: app/validators/status_pin_validator.rb
new file: app/views/about/_features.html.haml
deleted: app/views/about/_links.html.haml
deleted: app/views/about/_version.html.haml
deleted: app/views/about/terms.en.html.haml
new file: app/views/about/terms.html.haml
deleted: app/views/about/terms.ja.html.haml
deleted: app/views/about/terms.no.html.haml
modified: app/views/accounts/_grid_card.html.haml
deleted: app/views/accounts/show.activitystreams2.rabl
deleted: app/views/activitypub/base.activitystreams2.rabl
deleted: app/views/activitypub/intransient.activitystreams2.rabl
deleted: app/views/activitypub/types/announce.activitystreams2.rabl
deleted: app/views/activitypub/types/collection.activitystreams2.rabl
deleted: app/views/activitypub/types/create.activitystreams2.rabl
deleted: app/views/activitypub/types/note.activitystreams2.rabl
deleted: app/views/activitypub/types/ordered_collection.activitystreams2.rabl
deleted: app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
deleted: app/views/activitypub/types/person.activitystreams2.rabl
modified: app/views/admin/accounts/_account.html.haml
modified: app/views/admin/accounts/_card.html.haml
modified: app/views/admin/accounts/index.html.haml
modified: app/views/admin/domain_blocks/index.html.haml
modified: app/views/admin/domain_blocks/show.html.haml
modified: app/views/admin/instances/_instance.html.haml
modified: app/views/admin/instances/index.html.haml
modified: app/views/admin/reports/index.html.haml
modified: app/views/admin/settings/edit.html.haml
modified: app/views/admin/subscriptions/_subscription.html.haml
modified: app/views/admin/subscriptions/index.html.haml
modified: app/views/admin_mailer/new_report.text.erb
deleted: app/views/api/activitypub/activities/_show_status.activitystreams2.rabl
deleted: app/views/api/activitypub/activities/show_status_announce.activitystreams2.rabl
deleted: app/views/api/activitypub/activities/show_status_create.activitystreams2.rabl
deleted: app/views/api/activitypub/notes/show.activitystreams2.rabl
deleted: app/views/api/activitypub/outbox/show.activitystreams2.rabl
deleted: app/views/api/activitypub/outbox/show_page.activitystreams2.rabl
deleted: app/views/api/oembed/show.json.rabl
deleted: app/views/api/v1/accounts/index.rabl
deleted: app/views/api/v1/accounts/relationship.rabl
deleted: app/views/api/v1/accounts/relationships/index.rabl
deleted: app/views/api/v1/accounts/show.rabl
deleted: app/views/api/v1/accounts/statuses/index.rabl
deleted: app/views/api/v1/apps/create.rabl
deleted: app/views/api/v1/apps/show.rabl
deleted: app/views/api/v1/blocks/index.rabl
deleted: app/views/api/v1/favourites/index.rabl
deleted: app/views/api/v1/follow_requests/index.rabl
deleted: app/views/api/v1/follows/show.rabl
deleted: app/views/api/v1/instances/show.rabl
deleted: app/views/api/v1/media/create.rabl
deleted: app/views/api/v1/mutes/index.rabl
deleted: app/views/api/v1/notifications/index.rabl
deleted: app/views/api/v1/notifications/show.rabl
deleted: app/views/api/v1/reports/index.rabl
deleted: app/views/api/v1/reports/show.rabl
deleted: app/views/api/v1/search/index.rabl
deleted: app/views/api/v1/statuses/_media.rabl
deleted: app/views/api/v1/statuses/_mention.rabl
deleted: app/views/api/v1/statuses/_show.rabl
deleted: app/views/api/v1/statuses/_tags.rabl
deleted: app/views/api/v1/statuses/accounts.rabl
deleted: app/views/api/v1/statuses/card.rabl
deleted: app/views/api/v1/statuses/context.rabl
deleted: app/views/api/v1/statuses/index.rabl
deleted: app/views/api/v1/statuses/show.rabl
deleted: app/views/api/v1/timelines/show.rabl
modified: app/views/auth/passwords/edit.html.haml
modified: app/views/auth/registrations/_sessions.html.haml
modified: app/views/auth/registrations/new.html.haml
modified: app/views/auth/sessions/new.html.haml
modified: app/views/auth/sessions/two_factor.html.haml
modified: app/views/authorize_follows/show.html.haml
new file: app/views/authorize_follows/success.html.haml
modified: app/views/follower_accounts/index.html.haml
modified: app/views/following_accounts/index.html.haml
modified: app/views/home/index.html.haml
deleted: app/views/home/initial_state.json.rabl
modified: app/views/layouts/admin.html.haml
modified: app/views/layouts/application.html.haml
modified: app/views/layouts/auth.html.haml
modified: app/views/layouts/embedded.html.haml
new file: app/views/layouts/modal.html.haml
modified: app/views/manifests/show.json.rabl
modified: app/views/notification_mailer/digest.text.erb
modified: app/views/notification_mailer/favourite.text.erb
modified: app/views/notification_mailer/follow.text.erb
modified: app/views/notification_mailer/follow_request.text.erb
modified: app/views/notification_mailer/mention.text.erb
modified: app/views/notification_mailer/reblog.text.erb
modified: app/views/oauth/authorized_applications/index.html.haml
new file: app/views/settings/applications/_fields.html.haml
new file: app/views/settings/applications/index.html.haml
new file: app/views/settings/applications/new.html.haml
new file: app/views/settings/applications/show.html.haml
modified: app/views/settings/exports/show.html.haml
modified: app/views/settings/follower_domains/show.html.haml
modified: app/views/settings/preferences/show.html.haml
modified: app/views/settings/profiles/show.html.haml
modified: app/views/settings/two_factor_authentication/confirmations/new.html.haml
modified: app/views/settings/two_factor_authentications/show.html.haml
new file: app/views/shares/show.html.haml
modified: app/views/stream_entries/_detailed_status.html.haml
modified: app/views/stream_entries/embed.html.haml
modified: app/views/stream_entries/show.html.haml
modified: app/views/user_mailer/confirmation_instructions.fa.html.erb
modified: app/views/user_mailer/confirmation_instructions.fa.text.erb
modified: app/views/user_mailer/confirmation_instructions.fr.html.erb
modified: app/views/user_mailer/confirmation_instructions.fr.text.erb
modified: app/views/user_mailer/confirmation_instructions.oc.html.erb
modified: app/views/user_mailer/confirmation_instructions.oc.text.erb
modified: app/views/user_mailer/password_change.oc.html.erb
modified: app/views/user_mailer/password_change.oc.text.erb
modified: app/views/user_mailer/reset_password_instructions.oc.html.erb
modified: app/views/user_mailer/reset_password_instructions.oc.text.erb
modified: app/views/well_known/webfinger/show.json.rabl
modified: app/views/well_known/webfinger/show.xml.ruby
new file: app/workers/activitypub/delivery_worker.rb
new file: app/workers/activitypub/distribution_worker.rb
new file: app/workers/activitypub/post_upgrade_worker.rb
new file: app/workers/activitypub/processing_worker.rb
new file: app/workers/activitypub/raw_distribution_worker.rb
new file: app/workers/activitypub/reply_distribution_worker.rb
new file: app/workers/activitypub/update_distribution_worker.rb
new file: app/workers/authorize_follow_worker.rb
new file: app/workers/bootstrap_timeline_worker.rb
modified: app/workers/pubsubhubbub/delivery_worker.rb
modified: app/workers/pubsubhubbub/distribution_worker.rb
new file: app/workers/pubsubhubbub/raw_distribution_worker.rb
modified: app/workers/pubsubhubbub/subscribe_worker.rb
new file: app/workers/pubsubhubbub/unsubscribe_worker.rb
modified: app/workers/push_update_worker.rb
new file: app/workers/resolve_remote_account_worker.rb
new file: app/workers/web_push_notification_worker.rb
modified: boxfile.yml
modified: config/application.rb
modified: config/brakeman.ignore
modified: config/deploy.rb
modified: config/environment.rb
modified: config/environments/development.rb
modified: config/environments/production.rb
modified: config/environments/test.rb
modified: config/i18n-tasks.yml
new file: config/initializers/active_model_serializers.rb
modified: config/initializers/devise.rb
modified: config/initializers/doorkeeper.rb
modified: config/initializers/inflections.rb
new file: config/initializers/json_ld.rb
modified: config/initializers/mime_types.rb
modified: config/initializers/ostatus.rb
modified: config/initializers/paperclip.rb
modified: config/initializers/rack_attack.rb
modified: config/initializers/simple_form.rb
new file: config/initializers/vapid.rb
new file: config/locales/activerecord.fr.yml
new file: config/locales/activerecord.nl.yml
modified: config/locales/ar.yml
modified: config/locales/bg.yml
modified: config/locales/ca.yml
modified: config/locales/de.yml
modified: config/locales/devise.fr.yml
modified: config/locales/devise.nl.yml
modified: config/locales/devise.oc.yml
modified: config/locales/devise.pl.yml
modified: config/locales/doorkeeper.de.yml
modified: config/locales/doorkeeper.en.yml
modified: config/locales/doorkeeper.fa.yml
modified: config/locales/doorkeeper.fr.yml
modified: config/locales/doorkeeper.ja.yml
modified: config/locales/doorkeeper.nl.yml
modified: config/locales/doorkeeper.oc.yml
modified: config/locales/doorkeeper.pl.yml
modified: config/locales/en.yml
modified: config/locales/eo.yml
modified: config/locales/es.yml
modified: config/locales/fa.yml
modified: config/locales/fi.yml
modified: config/locales/fr.yml
modified: config/locales/he.yml
modified: config/locales/hr.yml
modified: config/locales/hu.yml
modified: config/locales/id.yml
modified: config/locales/io.yml
modified: config/locales/it.yml
modified: config/locales/ja.yml
new file: config/locales/ko.yml
modified: config/locales/nl.yml
modified: config/locales/no.yml
modified: config/locales/oc.yml
modified: config/locales/pl.yml
modified: config/locales/pt-BR.yml
modified: config/locales/pt.yml
modified: config/locales/ru.yml
modified: config/locales/simple_form.de.yml
modified: config/locales/simple_form.en.yml
modified: config/locales/simple_form.fa.yml
modified: config/locales/simple_form.fr.yml
modified: config/locales/simple_form.ja.yml
new file: config/locales/simple_form.ko.yml
modified: config/locales/simple_form.nl.yml
modified: config/locales/simple_form.oc.yml
modified: config/locales/simple_form.pl.yml
modified: config/locales/simple_form.ru.yml
modified: config/locales/th.yml
modified: config/locales/tr.yml
modified: config/locales/uk.yml
modified: config/locales/zh-CN.yml
modified: config/locales/zh-HK.yml
modified: config/locales/zh-TW.yml
modified: config/navigation.rb
modified: config/routes.rb
modified: config/settings.yml
modified: config/webpack/loaders/babel.js
modified: config/webpack/production.js
modified: config/webpack/shared.js
modified: config/webpack/translationRunner.js
new file: db/migrate/20170427011934_re_add_owner_to_application.rb
new file: db/migrate/20170711225116_fix_null_booleans.rb
new file: db/migrate/20170713112503_make_tag_search_case_insensitive.rb
new file: db/migrate/20170713175513_create_web_push_subscriptions.rb
new file: db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
new file: db/migrate/20170718211102_add_activitypub_to_accounts.rb
new file: db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb
new file: db/migrate/20170823162448_create_status_pins.rb
new file: db/migrate/20170824103029_add_timestamps_to_status_pins.rb
new file: db/migrate/20170829215220_remove_status_pins_account_index.rb
new file: db/migrate/20170901141119_truncate_preview_cards.rb
new file: db/migrate/20170901142658_create_join_table_preview_cards_statuses.rb
new file: db/migrate/20170905044538_add_index_id_account_id_activity_type_on_notifications.rb
new file: db/migrate/20170905165803_add_local_to_statuses.rb
modified: db/schema.rb
new file: lib/assets/emoji.json
new file: lib/json_ld/activitystreams.rb
new file: lib/json_ld/identity.rb
new file: lib/json_ld/security.rb
modified: lib/mastodon/version.rb
modified: lib/tasks/mastodon.rake
modified: nanobox/nginx-local.conf
modified: nanobox/nginx-stream.conf.erb
modified: nanobox/nginx-web.conf.erb
modified: package.json
new file: public/badge.png
new file: public/embed.js
modified: public/favicon-dev.ico
new file: public/sw.js
new file: public/web-push-icon_expand.png
new file: public/web-push-icon_favourite.png
new file: public/web-push-icon_reblog.png
modified: scalingo.json
modified: spec/controllers/accounts_controller_spec.rb
new file: spec/controllers/activitypub/inboxes_controller_spec.rb
new file: spec/controllers/activitypub/outboxes_controller_spec.rb
modified: spec/controllers/admin/settings_controller_spec.rb
deleted: spec/controllers/api/activitypub/activities_controller_spec.rb
deleted: spec/controllers/api/activitypub/notes_controller_spec.rb
deleted: spec/controllers/api/activitypub/outbox_controller_spec.rb
modified: spec/controllers/api/oembed_controller_spec.rb
modified: spec/controllers/api/subscriptions_controller_spec.rb
modified: spec/controllers/api/v1/accounts/credentials_controller_spec.rb
modified: spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
modified: spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
modified: spec/controllers/api/v1/accounts/relationships_controller_spec.rb
modified: spec/controllers/api/v1/accounts/search_controller_spec.rb
modified: spec/controllers/api/v1/accounts/statuses_controller_spec.rb
modified: spec/controllers/api/v1/accounts_controller_spec.rb
modified: spec/controllers/api/v1/blocks_controller_spec.rb
modified: spec/controllers/api/v1/domain_blocks_controller_spec.rb
modified: spec/controllers/api/v1/favourites_controller_spec.rb
modified: spec/controllers/api/v1/follow_requests_controller_spec.rb
modified: spec/controllers/api/v1/follows_controller_spec.rb
modified: spec/controllers/api/v1/instances_controller_spec.rb
modified: spec/controllers/api/v1/media_controller_spec.rb
modified: spec/controllers/api/v1/mutes_controller_spec.rb
modified: spec/controllers/api/v1/notifications_controller_spec.rb
modified: spec/controllers/api/v1/reports_controller_spec.rb
modified: spec/controllers/api/v1/search_controller_spec.rb
modified: spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
modified: spec/controllers/api/v1/statuses/favourites_controller_spec.rb
modified: spec/controllers/api/v1/statuses/mutes_controller_spec.rb
new file: spec/controllers/api/v1/statuses/pins_controller_spec.rb
modified: spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
modified: spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
modified: spec/controllers/api/v1/statuses_controller_spec.rb
modified: spec/controllers/api/v1/timelines/home_controller_spec.rb
modified: spec/controllers/api/v1/timelines/public_controller_spec.rb
modified: spec/controllers/api/v1/timelines/tag_controller_spec.rb
new file: spec/controllers/api/web/push_subscriptions_controller_spec.rb
modified: spec/controllers/auth/confirmations_controller_spec.rb
modified: spec/controllers/auth/passwords_controller_spec.rb
modified: spec/controllers/auth/sessions_controller_spec.rb
modified: spec/controllers/authorize_follows_controller_spec.rb
modified: spec/controllers/concerns/account_controller_concern_spec.rb
modified: spec/controllers/concerns/signature_verification_spec.rb
modified: spec/controllers/home_controller_spec.rb
new file: spec/controllers/settings/applications_controller_spec.rb
modified: spec/controllers/settings/profiles_controller_spec.rb
modified: spec/controllers/statuses_controller_spec.rb
modified: spec/controllers/stream_entries_controller_spec.rb
modified: spec/controllers/well_known/webfinger_controller_spec.rb
modified: spec/fabricators/status_fabricator.rb
new file: spec/fabricators/status_pin_fabricator.rb
new file: spec/fabricators/web_push_subscription_fabricator.rb
new file: spec/fixtures/requests/koi8-r.txt
modified: spec/fixtures/requests/sjis.txt
new file: spec/fixtures/requests/sjis_with_wrong_charset.txt
deleted: spec/helpers/activitystreams2_builder_helper_spec.rb
new file: spec/helpers/emoji_helper_spec.rb
modified: spec/helpers/instance_helper_spec.rb
new file: spec/helpers/jsonld_helper_spec.rb
deleted: spec/helpers/routing_helper.rb
new file: spec/helpers/routing_helper_spec.rb
modified: spec/helpers/settings_helper_spec.rb
modified: spec/javascript/components/avatar.test.js
new file: spec/javascript/components/avatar_overlay.test.js
modified: spec/javascript/components/display_name.test.js
modified: spec/javascript/components/dropdown_menu.test.js
modified: spec/javascript/components/emojify.test.js
new file: spec/lib/activitypub/activity/accept_spec.rb
new file: spec/lib/activitypub/activity/announce_spec.rb
new file: spec/lib/activitypub/activity/block_spec.rb
new file: spec/lib/activitypub/activity/create_spec.rb
new file: spec/lib/activitypub/activity/delete_spec.rb
new file: spec/lib/activitypub/activity/follow_spec.rb
new file: spec/lib/activitypub/activity/like_spec.rb
new file: spec/lib/activitypub/activity/reject_spec.rb
new file: spec/lib/activitypub/activity/undo_spec.rb
new file: spec/lib/activitypub/activity/update_spec.rb
new file: spec/lib/activitypub/linked_data_signature_spec.rb
new file: spec/lib/activitypub/tag_manager_spec.rb
deleted: spec/lib/atom_serializer_spec.rb
new file: spec/lib/emoji_spec.rb
modified: spec/lib/feed_manager_spec.rb
modified: spec/lib/formatter_spec.rb
deleted: spec/lib/inline_rabl_scope_spec.rb
new file: spec/lib/ostatus/atom_serializer_spec.rb
new file: spec/lib/status_finder_spec.rb
deleted: spec/lib/stream_entry_finder_spec.rb
modified: spec/lib/tag_manager_spec.rb
modified: spec/lib/user_settings_decorator_spec.rb
modified: spec/models/feed_spec.rb
modified: spec/models/report_spec.rb
new file: spec/models/status_pin_spec.rb
modified: spec/models/status_spec.rb
modified: spec/models/tag_spec.rb
modified: spec/models/user_spec.rb
new file: spec/models/web/push_subscription_spec.rb
modified: spec/rails_helper.rb
modified: spec/requests/localization_spec.rb
new file: spec/services/activitypub/fetch_remote_account_service_spec.rb
new file: spec/services/activitypub/fetch_remote_status_service_spec.rb
new file: spec/services/activitypub/process_account_service_spec.rb
new file: spec/services/activitypub/process_collection_service_spec.rb
modified: spec/services/authorize_follow_service_spec.rb
modified: spec/services/batched_remove_status_service_spec.rb
modified: spec/services/block_service_spec.rb
new file: spec/services/bootstrap_timeline_service_spec.rb
modified: spec/services/favourite_service_spec.rb
modified: spec/services/fetch_link_card_service_spec.rb
modified: spec/services/fetch_remote_resource_service_spec.rb
modified: spec/services/follow_service_spec.rb
modified: spec/services/post_status_service_spec.rb
modified: spec/services/process_feed_service_spec.rb
modified: spec/services/process_mentions_service_spec.rb
modified: spec/services/reblog_service_spec.rb
modified: spec/services/reject_follow_service_spec.rb
modified: spec/services/remove_status_service_spec.rb
modified: spec/services/resolve_remote_account_service_spec.rb
modified: spec/services/unblock_service_spec.rb
modified: spec/services/unfollow_service_spec.rb
modified: spec/services/unsubscribe_service_spec.rb
modified: spec/spec_helper.rb
new file: spec/validators/status_length_validator_spec.rb
modified: spec/views/about/_contact.html.haml_spec.rb
deleted: spec/views/about/_links.html.haml_spec.rb
modified: spec/views/about/show.html.haml_spec.rb
modified: spec/views/stream_entries/show.html.haml_spec.rb
new file: spec/workers/activitypub/delivery_worker_spec.rb
new file: spec/workers/activitypub/distribution_worker_spec.rb
new file: spec/workers/activitypub/processing_worker_spec.rb
new file: spec/workers/activitypub/update_distribution_worker_spec.rb
modified: spec/workers/pubsubhubbub/confirmation_worker_spec.rb
modified: spec/workers/pubsubhubbub/delivery_worker_spec.rb
modified: spec/workers/pubsubhubbub/distribution_worker_spec.rb
deleted: storybook/config.js
deleted: storybook/initial_state.js
deleted: storybook/stories/autosuggest_textarea.story.js
deleted: storybook/stories/button.story.js
deleted: storybook/stories/character_counter.story.js
deleted: storybook/stories/loading_indicator.story.js
deleted: storybook/stories/onboarding_modal.story.js
deleted: storybook/storybook.scss
deleted: storybook/webpack.config.js
modified: streaming/index.js
modified: yarn.lock
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/javascript/mastodon/actions/compose.js
both modified: app/javascript/mastodon/actions/statuses.js
both modified: app/javascript/mastodon/components/column_header.js
both modified: app/javascript/mastodon/components/media_gallery.js
both modified: app/javascript/mastodon/components/status.js
both modified: app/javascript/mastodon/components/status_action_bar.js
both modified: app/javascript/mastodon/components/status_list.js
both modified: app/javascript/mastodon/containers/mastodon.js
both modified: app/javascript/mastodon/containers/status_container.js
both modified: app/javascript/mastodon/features/account/components/action_bar.js
both modified: app/javascript/mastodon/features/community_timeline/index.js
both modified: app/javascript/mastodon/features/compose/components/compose_form.js
both modified: app/javascript/mastodon/features/compose/index.js
both modified: app/javascript/mastodon/features/getting_started/index.js
both modified: app/javascript/mastodon/features/ui/components/column.js
both modified: app/javascript/mastodon/features/ui/components/columns_area.js
both modified: app/javascript/mastodon/features/ui/components/image_loader.js
both modified: app/javascript/mastodon/features/ui/components/modal_root.js
both modified: app/javascript/mastodon/features/ui/components/report_modal.js
both modified: app/javascript/mastodon/features/ui/components/tabs_bar.js
both modified: app/javascript/mastodon/features/ui/index.js
both modified: app/javascript/mastodon/load_polyfills.js
both modified: app/javascript/mastodon/locales/en.json
both modified: app/javascript/mastodon/locales/ja.json
both modified: app/javascript/mastodon/reducers/compose.js
both modified: app/javascript/mastodon/reducers/index.js
both modified: app/javascript/mastodon/reducers/status_lists.js
both modified: app/javascript/mastodon/reducers/statuses.js
both modified: app/javascript/mastodon/reducers/timelines.js
both modified: app/javascript/mastodon/reducers/user_lists.js
both modified: app/javascript/packs/public.js
both modified: app/javascript/styles/about.scss
both modified: app/javascript/styles/accounts.scss
both modified: app/javascript/styles/admin.scss
both modified: app/javascript/styles/basics.scss
both modified: app/javascript/styles/compact_header.scss
both modified: app/javascript/styles/components.scss
both modified: app/javascript/styles/landing_strip.scss
both modified: app/javascript/styles/rtl.scss
both modified: app/views/about/_contact.html.haml
both modified: app/views/about/_registration.html.haml
both modified: app/views/about/more.html.haml
both modified: app/views/about/show.html.haml
both modified: app/views/accounts/_header.html.haml
both modified: app/views/accounts/show.html.haml
both modified: app/views/admin/accounts/show.html.haml
both modified: app/views/admin/reports/show.html.haml
both modified: app/views/auth/registrations/edit.html.haml
both modified: app/views/settings/deletes/show.html.haml
both modified: app/views/shared/_landing_strip.html.haml
both modified: app/views/stream_entries/_status.html.haml
both modified: app/views/tags/show.html.haml
both modified: app/views/user_mailer/reset_password_instructions.fr.html.erb
both modified: app/views/user_mailer/reset_password_instructions.fr.text.erb
Created
September 12, 2017 09:35
-
-
Save ykzts/19db039ec532706e0477608365c5e33c to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment