about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/index.js
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2017-05-08 23:49:53 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-08 16:49:53 +0200
commit459bbfa4b21c20809a142c41c389b7a5edd28bd8 (patch)
treea6ae031077452d36fd743873da888054e8f9034b /app/javascript/mastodon/reducers/index.js
parent7140def5c9e49535d8ea13c8061a55588a348fda (diff)
Prevent selection of unacceptable Content-Type files (#2910)
* Prevent selection of unacceptable Content-Type files

* replace hard code

* media_attachments accept content-types in initial state
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
-rw-r--r--app/javascript/mastodon/reducers/index.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index f05067c47..0665f494b 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -9,6 +9,7 @@ import user_lists from './user_lists';
 import accounts from './accounts';
 import accounts_counters from './accounts_counters';
 import statuses from './statuses';
+import media_attachments from './media_attachments';
 import relationships from './relationships';
 import search from './search';
 import notifications from './notifications';
@@ -28,6 +29,7 @@ export default combineReducers({
   status_lists,
   accounts,
   accounts_counters,
+  media_attachments,
   statuses,
   relationships,
   search,