gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626

Browse source
This commit is contained in:
Eugen Rochko 2017-02-26 22:44:31 +01:00
commit 4bb8ff7c8e
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/components/features/status/index.jsx
View file

@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { fetchStatus } from '../../actions/statuses';
import Immutable from 'immutable';
import EmbeddedStatus from '../../components/status';
import LoadingIndicator from '../../components/loading_indicator';
import StatusNotFound from '../../components/status_not_found';
import DetailedStatus from './components/detailed_status';
import ActionBar from './components/action_bar';
import Column from '../ui/components/column';
@ -117,7 +117,8 @@ const Status = React.createClass({
if (status === null) {
return (
<Column>
<LoadingIndicator />
<ColumnBackButton />
<StatusNotFound />
</Column>
);
}