about summary refs log tree commit diff
path: root/app/assets/javascripts/components/containers/mastodon.jsx
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-26 21:33:51 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-26 21:33:51 +0100
commit3689c119f0ad8d523ab8deb3c2c8ed0a9c84db6e (patch)
treea3c81d415e9eb7c043bef0cbee43200ab708146b /app/assets/javascripts/components/containers/mastodon.jsx
parent004382e4d09f90e5ca824996c4b20e99599bf98f (diff)
Replacing follow requests in the settings area with in-UI column
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
-rw-r--r--app/assets/javascripts/components/containers/mastodon.jsx3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index 69fe2d07f..670455376 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -34,6 +34,7 @@ import Reblogs from '../features/reblogs';
 import Favourites from '../features/favourites';
 import HashtagTimeline from '../features/hashtag_timeline';
 import Notifications from '../features/notifications';
+import FollowRequests from '../features/follow_requests';
 import { IntlProvider, addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
 import de from 'react-intl/locale-data/de';
@@ -125,6 +126,8 @@ const Mastodon = React.createClass({
                 <Route path='followers' component={Followers} />
                 <Route path='following' component={Following} />
               </Route>
+
+              <Route path='follow_requests' component={FollowRequests} />
             </Route>
           </Router>
         </Provider>