]> cat aescling's git repositories - mastodon.git/commit
Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5
authorSurinna Curtis <ekiru.0@gmail.com>
Thu, 16 Nov 2017 07:21:16 +0000 (01:21 -0600)
committerSurinna Curtis <ekiru.0@gmail.com>
Thu, 16 Nov 2017 07:21:16 +0000 (01:21 -0600)
commit35fbdc36f92b610e8a73e2acb220e87cf5fc83b0
treefcd9bdb5ba49ab7a6a79590c74db858ae77b4239
parent30237259367a0ef2b20908518b86bbeb358999b5
parent88627fd7aa2493a6890d60a5965459e4c7fe6fe9
Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5
60 files changed:
app/controllers/api/v1/search_controller.rb
app/javascript/glitch/components/account/header.js
app/javascript/glitch/components/status/action_bar.js
app/javascript/glitch/components/status/container.js
app/javascript/glitch/components/status/index.js
app/javascript/mastodon/actions/streaming.js
app/javascript/mastodon/components/account.js
app/javascript/mastodon/components/icon_button.js
app/javascript/mastodon/components/media_gallery.js
app/javascript/mastodon/components/status.js
app/javascript/mastodon/components/status_action_bar.js
app/javascript/mastodon/containers/status_container.js
app/javascript/mastodon/features/account/components/action_bar.js
app/javascript/mastodon/features/account/components/header.js
app/javascript/mastodon/features/account_timeline/components/header.js
app/javascript/mastodon/features/account_timeline/containers/header_container.js
app/javascript/mastodon/features/account_timeline/index.js
app/javascript/mastodon/features/blocks/index.js
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/features/compose/containers/compose_form_container.js
app/javascript/mastodon/features/follow_requests/index.js
app/javascript/mastodon/features/getting_started/index.js
app/javascript/mastodon/features/mutes/index.js
app/javascript/mastodon/features/status/components/action_bar.js
app/javascript/mastodon/features/status/components/detailed_status.js
app/javascript/mastodon/features/status/index.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/mastodon/initial_state.js
app/javascript/mastodon/reducers/compose.js
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/concerns/account_interactions.rb
app/models/follow.rb
app/models/follow_request.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/models/stream_entry.rb
app/policies/status_policy.rb
app/serializers/initial_state_serializer.rb
app/services/notify_service.rb
app/services/post_status_service.rb
app/views/accounts/_header.html.haml
app/views/home/index.html.haml
app/views/layouts/application.html.haml
config/locales/en.yml
config/navigation.rb
config/routes.rb
config/settings.yml
config/webpack/shared.js
db/schema.rb
package.json
spec/models/account_spec.rb
spec/models/concerns/account_interactions_spec.rb
spec/models/follow_request_spec.rb
spec/models/status_spec.rb
spec/services/notify_service_spec.rb
streaming/index.js
yarn.lock