summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes.js
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-06-21 12:07:35 -0500
committerMike Greiling <mike@pixelcog.com>2019-06-21 12:36:03 -0500
commit55a5ced463ef8bc465476247cee5cc458a6b2355 (patch)
tree6101b6c99ba91ee08018362779d5f8b306d42493 /app/assets/javascripts/notes.js
parent76f49de4e772c4101bcb8df801ad9b7a78adcea7 (diff)
downloadgitlab-ce-55a5ced463ef8bc465476247cee5cc458a6b2355.tar.gz
Upgrade prettier to latest (v1.18.2)
Upgrades prettier to the latest version, and auto-corrects files with yarn prettier-all-save The diffs all seem to stem from formatting changes in brackets within template literals. Nothing major. Relevant changelogs here: https://prettier.io/blog/2019/04/12/1.17.0.html https://prettier.io/blog/2019/06/06/1.18.0.html
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r--app/assets/javascripts/notes.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index a7156bd2406..9cc31e26648 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -1284,9 +1284,7 @@ export default class Notes {
putConflictEditWarningInPlace(noteEntity, $note) {
if ($note.find('.js-conflict-edit-warning').length === 0) {
- const open_link = `<a href="#note_${
- noteEntity.id
- }" target="_blank" rel="noopener noreferrer">`;
+ const open_link = `<a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer">`;
const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
${sprintf(
s__(