mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 22:01:35 +01:00
bf3cb42da7
Cherry-picked d2528b26b6
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
88 lines
2.2 KiB
JavaScript
88 lines
2.2 KiB
JavaScript
import { combineReducers } from 'redux-immutable';
|
|
import dropdown_menu from './dropdown_menu';
|
|
import timelines from './timelines';
|
|
import meta from './meta';
|
|
import alerts from './alerts';
|
|
import { loadingBarReducer } from 'react-redux-loading-bar';
|
|
import modal from './modal';
|
|
import user_lists from './user_lists';
|
|
import domain_lists from './domain_lists';
|
|
import accounts from './accounts';
|
|
import accounts_counters from './accounts_counters';
|
|
import statuses from './statuses';
|
|
import relationships from './relationships';
|
|
import settings from './settings';
|
|
import push_notifications from './push_notifications';
|
|
import status_lists from './status_lists';
|
|
import mutes from './mutes';
|
|
import blocks from './blocks';
|
|
import boosts from './boosts';
|
|
import server from './server';
|
|
import contexts from './contexts';
|
|
import compose from './compose';
|
|
import search from './search';
|
|
import media_attachments from './media_attachments';
|
|
import notifications from './notifications';
|
|
import height_cache from './height_cache';
|
|
import custom_emojis from './custom_emojis';
|
|
import lists from './lists';
|
|
import listEditor from './list_editor';
|
|
import listAdder from './list_adder';
|
|
import filters from './filters';
|
|
import conversations from './conversations';
|
|
import suggestions from './suggestions';
|
|
import polls from './polls';
|
|
import trends from './trends';
|
|
import missed_updates from './missed_updates';
|
|
import announcements from './announcements';
|
|
import markers from './markers';
|
|
import picture_in_picture from './picture_in_picture';
|
|
import accounts_map from './accounts_map';
|
|
import history from './history';
|
|
import tags from './tags';
|
|
|
|
const reducers = {
|
|
announcements,
|
|
dropdown_menu,
|
|
timelines,
|
|
meta,
|
|
alerts,
|
|
loadingBar: loadingBarReducer,
|
|
modal,
|
|
user_lists,
|
|
domain_lists,
|
|
status_lists,
|
|
accounts,
|
|
accounts_counters,
|
|
accounts_map,
|
|
statuses,
|
|
relationships,
|
|
settings,
|
|
push_notifications,
|
|
mutes,
|
|
blocks,
|
|
boosts,
|
|
server,
|
|
contexts,
|
|
compose,
|
|
search,
|
|
media_attachments,
|
|
notifications,
|
|
height_cache,
|
|
custom_emojis,
|
|
lists,
|
|
listEditor,
|
|
listAdder,
|
|
filters,
|
|
conversations,
|
|
suggestions,
|
|
polls,
|
|
trends,
|
|
missed_updates,
|
|
markers,
|
|
picture_in_picture,
|
|
history,
|
|
tags,
|
|
};
|
|
|
|
export default combineReducers(reducers);
|