Merge branch 'bug/fix-comments' into 'master'

Bug/fix comments

See merge request framasoft/mobilizon!351
This commit is contained in:
Thomas Citharel 2019-12-16 17:14:41 +01:00
commit 3c5d860ee5
5 changed files with 7 additions and 6 deletions

View file

@ -107,8 +107,6 @@ pages:
stage: deploy stage: deploy
script: script:
- mkdir public - mkdir public
# We use Python 3.5 in the current Stretch-based image. See https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/issues/3
- sed -i "s+print(f\"WARNING - plugin locale setting '{plugin_locale}' will overwrite mkdocs locale '{mkdocs_locale}'\")+print(\"WARNING - plugin locale setting will overwrite mkdocs locale\")+g" /usr/local/lib/python3.5/dist-packages/mkdocs_git_revision_date_localized_plugin/plugin.py
- mkdocs build - mkdocs build
- mv site/* public/ - mv site/* public/
- mix deps.get - mix deps.get

View file

@ -1,7 +1,7 @@
FROM elixir:latest FROM elixir:latest
LABEL maintainer="Thomas Citharel <tcit@tcit.fr>" LABEL maintainer="Thomas Citharel <tcit@tcit.fr>"
ENV REFRESHED_AT=2019-12-15 ENV REFRESHED_AT=2019-12-16
RUN apt-get update -yq && apt-get install -yq build-essential inotify-tools postgresql-client git curl gnupg xvfb libgtk-3-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 python3-pip RUN apt-get update -yq && apt-get install -yq build-essential inotify-tools postgresql-client git curl gnupg xvfb libgtk-3-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 python3-pip
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash && apt-get install nodejs -yq RUN curl -sL https://deb.nodesource.com/setup_10.x | bash && apt-get install nodejs -yq
RUN npm install -g yarn wait-on RUN npm install -g yarn wait-on

View file

@ -116,7 +116,7 @@ import { CREATE_REPORT } from '@/graphql/report';
}, },
components: { components: {
editor: () => import(/* webpackChunkName: "editor" */ '@/components/Editor.vue'), editor: () => import(/* webpackChunkName: "editor" */ '@/components/Editor.vue'),
Comment, comment: () => import(/* webpackChunkName: "comment" */ './Comment.vue'),
}, },
}) })
export default class Comment extends Vue { export default class Comment extends Vue {
@ -223,7 +223,6 @@ export default class Comment extends Vue {
} }
reportModal() { reportModal() {
console.log('report modal');
this.$buefy.modal.open({ this.$buefy.modal.open({
parent: this, parent: this,
component: ReportModal, component: ReportModal,

View file

@ -171,6 +171,7 @@ export const FETCH_EVENTS = gql`
url url
}, },
preferredUsername, preferredUsername,
domain,
name, name,
}, },
# attributedTo { # attributedTo {

View file

@ -7,6 +7,7 @@ export const REPORTS = gql`
reported { reported {
id, id,
preferredUsername, preferredUsername,
domain,
name, name,
avatar { avatar {
url url
@ -46,7 +47,8 @@ const REPORT_FRAGMENT = gql`
name, name,
avatar { avatar {
url url
} },
domain
}, },
reporter { reporter {
id, id,
@ -74,6 +76,7 @@ const REPORT_FRAGMENT = gql`
actor { actor {
id, id,
preferredUsername, preferredUsername,
domain,
name, name,
avatar { avatar {
url url