Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into fix/refactoring_status_delete

Browse source
This commit is contained in:
Jiayi Zheng 2016-12-08 20:29:06 +01:00
commit ed0d02b0ad
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -18,3 +18,6 @@ build:
script: script:
- npm install - npm install
- npm run build - npm run build
artifacts:
paths:
- dist/

2
src/modules/statuses.js
View file

@ -203,7 +203,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
let retweet let retweet
// If the retweeted status is already there, don't add the retweet // If the retweeted status is already there, don't add the retweet
// to the timeline. // to the timeline.
if (timeline && find(timelineObject.visibleStatuses, {id: retweetedStatus.id})) { if (timeline && find(timelineObject.statuses, {id: retweetedStatus.id})) {
// Already have it visible, don't add to timeline, don't show. // Already have it visible, don't add to timeline, don't show.
retweet = addStatus(status, false, false) retweet = addStatus(status, false, false)
} else { } else {