From d0e91abe5a9f3e5e776fe29d892aa51a1c7a4773 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 5 Dec 2016 13:14:40 +0100 Subject: [PATCH 1/3] Remove wrong rights check. --- src/components/status/status.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 8b2561cf..3245d98b 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -22,7 +22,7 @@ const Status = { return !!this.$store.state.users.currentUser }, deleted () { return this.statusoid.deleted }, - canDelete () { return this.statusoid.user.rights.delete_others_notice || this.statusoid.user.id == this.$store.state.users.currentUser.id } + canDelete () { return this.statusoid.user.id === this.$store.state.users.currentUser.id } }, components: { Attachment, From 7978ffeb1d20c3b2568ecd351747229a2548e4d3 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 8 Dec 2016 12:45:09 +0100 Subject: [PATCH 2/3] Check all statuses in timeline for old retweets. This will fix the problem of retweets showing up again and again. --- src/modules/statuses.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { From 213316e68f0361bf045ff5a09f03633f7b40c75d Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 8 Dec 2016 15:55:12 +0100 Subject: [PATCH 3/3] add artifacts --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) 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/