IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #789 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.18.2

Browse Source 
Bump prettier from 1.17.1 to 1.18.2 in /backend
This commit is contained in:
Robert Schäfer 2019-06-11 23:44:00 +02:00 committed by GitHub
commit 90107cfb18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -105,7 +105,7 @@
"graphql-request": "~1.8.2", "graphql-request": "~1.8.2",
"jest": "~24.8.0", "jest": "~24.8.0",
"nodemon": "~1.19.1", "nodemon": "~1.19.1",
"prettier": "~1.17.1", "prettier": "~1.18.2",
"supertest": "~4.0.2" "supertest": "~4.0.2"
} }
} }

8
backend/src/activitypub/NitroDataSource.js
View File

@ -505,9 +505,7 @@ export default class NitroDataSource {
const result2 = await this.client.mutate({ const result2 = await this.client.mutate({
mutation: gql` mutation: gql`
mutation { mutation {
AddCommentAuthor(from: {id: "${ AddCommentAuthor(from: {id: "${result.data.CreateComment.id}"}, to: {id: "${toUserId}"}) {
result.data.CreateComment.id
}"}, to: {id: "${toUserId}"}) {
id id
} }
} }
@ -519,9 +517,7 @@ export default class NitroDataSource {
result = await this.client.mutate({ result = await this.client.mutate({
mutation: gql` mutation: gql`
mutation { mutation {
AddCommentPost(from: { id: "${ AddCommentPost(from: { id: "${result.data.CreateComment.id}", to: { id: "${postId}" }}) {
result.data.CreateComment.id
}", to: { id: "${postId}" }}) {
id id
} }
} }

4
backend/src/middleware/notifications/spec.js
View File

@ -87,9 +87,7 @@ describe('currentUser { notifications }', () => {
describe('who mentions me again', () => { describe('who mentions me again', () => {
beforeEach(async () => { beforeEach(async () => {
const updatedContent = `${ const updatedContent = `${post.content} One more mention to <a href="/profile/you" class="mention">@al-capone</a>`
post.content
} One more mention to <a href="/profile/you" class="mention">@al-capone</a>`
// The response `post.content` contains a link but the XSSmiddleware // The response `post.content` contains a link but the XSSmiddleware
// should have the `mention` CSS class removed. I discovered this // should have the `mention` CSS class removed. I discovered this
// during development and thought: A feature not a bug! This way we // during development and thought: A feature not a bug! This way we

8
backend/yarn.lock
View File

@ -6230,10 +6230,10 @@ prettier-linter-helpers@^1.0.0:
dependencies: dependencies:
fast-diff "^1.1.2" fast-diff "^1.1.2"
prettier@~1.17.1: prettier@~1.18.2:
version "1.17.1" version "1.18.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg== integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
pretty-format@^24.8.0: pretty-format@^24.8.0:
version "24.8.0" version "24.8.0"