From f18ae14741b1169f77f0b4f03c383343050fc236 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2019 11:12:27 +0000
Subject: [PATCH 1/2] Bump prettier from 1.17.1 to 1.18.2 in /backend

Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 40ea9476d..543e771d1 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -105,7 +105,7 @@
     "graphql-request": "~1.8.2",
     "jest": "~24.8.0",
     "nodemon": "~1.19.1",
-    "prettier": "~1.17.1",
+    "prettier": "~1.18.2",
     "supertest": "~4.0.2"
   }
 }
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 61803eb1f..20866b01d 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -6230,10 +6230,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@~1.17.1:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
-  integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
+prettier@~1.18.2:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
 
 pretty-format@^24.8.0:
   version "24.8.0"

From 54c7c204c24bc8f17a8b2828ad33217850ee9b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 11 Jun 2019 23:10:26 +0200
Subject: [PATCH 2/2] Run `yarn run lint --fix`

---
 backend/src/activitypub/NitroDataSource.js   | 8 ++------
 backend/src/middleware/notifications/spec.js | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/backend/src/activitypub/NitroDataSource.js b/backend/src/activitypub/NitroDataSource.js
index eea37337a..0900bed6c 100644
--- a/backend/src/activitypub/NitroDataSource.js
+++ b/backend/src/activitypub/NitroDataSource.js
@@ -505,9 +505,7 @@ export default class NitroDataSource {
     const result2 = await this.client.mutate({
       mutation: gql`
           mutation {
-              AddCommentAuthor(from: {id: "${
-                result.data.CreateComment.id
-              }"}, to: {id: "${toUserId}"}) {
+              AddCommentAuthor(from: {id: "${result.data.CreateComment.id}"}, to: {id: "${toUserId}"}) {
                   id
               }
           }
@@ -519,9 +517,7 @@ export default class NitroDataSource {
     result = await this.client.mutate({
       mutation: gql`
           mutation {
-              AddCommentPost(from: { id: "${
-                result.data.CreateComment.id
-              }", to: { id: "${postId}" }}) {
+              AddCommentPost(from: { id: "${result.data.CreateComment.id}", to: { id: "${postId}" }}) {
                   id
               }
           }
diff --git a/backend/src/middleware/notifications/spec.js b/backend/src/middleware/notifications/spec.js
index 65212e544..985654b0f 100644
--- a/backend/src/middleware/notifications/spec.js
+++ b/backend/src/middleware/notifications/spec.js
@@ -87,9 +87,7 @@ describe('currentUser { notifications }', () => {
 
         describe('who mentions me again', () => {
           beforeEach(async () => {
-            const updatedContent = `${
-              post.content
-            } One more mention to <a href="/profile/you" class="mention">@al-capone</a>`
+            const updatedContent = `${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
             // should have the `mention` CSS class removed. I discovered this
             // during development and thought: A feature not a bug! This way we