diff options
| author | Jiayi Zheng <thebluber@gmail.com> | 2016-12-08 20:29:06 +0100 |
|---|---|---|
| committer | Jiayi Zheng <thebluber@gmail.com> | 2016-12-08 20:29:06 +0100 |
| commit | ed0d02b0ad8dc3b77453154a2ea0997d272b72f9 (patch) | |
| tree | 880321cb59f161b157c06a3878a29d154841b5a5 | |
| parent | c24e44a8f22be1620b103b75ebd255cd610e143e (diff) | |
| parent | 224488ea12fade7ef490158e1fa61055676c009f (diff) | |
Merge branch 'develop' into fix/refactoring_status_delete
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | src/modules/statuses.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd576082..32e8cb3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,3 +18,6 @@ build: script: - npm install - npm run build + artifacts: + paths: + - dist/ diff --git a/src/modules/statuses.js b/src/modules/statuses.js index aab198d8..1db1f1b0 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -203,7 +203,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us let retweet // If the retweeted status is already there, don't add the retweet // 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. retweet = addStatus(status, false, false) } else { |