Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Remove npm-run-all dependency (#9401)

Browse source 
Fix #9359
This commit is contained in:
Eugen Rochko 2018-11-30 19:16:32 +01:00 • committed by GitHub
parent d0453e77dc
commit 3948b6fa52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/actions/timelines.js
View file

@ -15,7 +15,7 @@ export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';
export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
export function updateTimeline(timeline, status, accept) {
return (dispatch, getState) => {
return dispatch => {
if (typeof accept === 'function' && !accept(status)) {
return;
}

4
app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
View file

@ -5,8 +5,8 @@ import { injectIntl, FormattedMessage } from 'react-intl';
import Toggle from 'react-toggle';
import AsyncSelect from 'react-select/lib/Async';
@injectIntl
export default class ColumnSettings extends React.PureComponent {
export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
settings: ImmutablePropTypes.map.isRequired,