diff --git a/.gitignore b/.gitignore index bc9103de..faf39252 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ npm-debug.log test/unit/coverage test/e2e/reports selenium-debug.log +.idea/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d3cba05..c31d2d31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,15 +27,20 @@ before_script: # paths: # - node_modules/ +stages: + - build + - test + - deploy + test: + stage: test script: - - npm install -g yarn - yarn - npm run unit build: + stage: build script: - - npm install -g yarn - yarn - npm run build artifacts: @@ -43,11 +48,11 @@ build: - dist/ deploy: + stage: deploy environment: dev only: - develop script: - - npm install -g yarn - yarn - npm run build - scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index f4f6aebf..c3f52f57 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -29,7 +29,11 @@ const Attachment = { } }, toggleHidden () { - this.showHidden = !this.showHidden + let img = document.createElement('img') + img.src = this.attachment.url + img.onload = () => { + this.showHidden = !this.showHidden + } } } } diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 9675e69f..a150ece3 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,6 +1,6 @@