Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f8f25b3a
Commit
f8f25b3a
authored
Feb 21, 2020
by
Raihan Kabir
Committed by
Natalia Tepluhina
Feb 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/notes.js'"
parent
491de650
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+2
-6
changelogs/unreleased/rk4bir-master-patch-60164.yml
changelogs/unreleased/rk4bir-master-patch-60164.yml
+5
-0
No files found.
app/assets/javascripts/notes.js
View file @
f8f25b3a
...
@@ -1808,11 +1808,7 @@ export default class Notes {
...
@@ -1808,11 +1808,7 @@ export default class Notes {
$editingNote
.
removeClass
(
'
is-editing fade-in-full
'
).
addClass
(
'
being-posted fade-in-half
'
);
$editingNote
.
removeClass
(
'
is-editing fade-in-full
'
).
addClass
(
'
being-posted fade-in-half
'
);
$editingNote
$editingNote
.
find
(
'
.note-headline-meta a
'
)
.
find
(
'
.note-headline-meta a
'
)
.
html
(
.
html
(
'
<span class="spinner align-text-bottom"></span>
'
);
`<i class="fa fa-spinner fa-spin" aria-label="
${
__
(
'
Comment is being updated
'
,
)}
" aria-hidden="true"></i>`
,
);
// Make request to update comment on server
// Make request to update comment on server
axios
axios
...
@@ -1825,7 +1821,7 @@ export default class Notes {
...
@@ -1825,7 +1821,7 @@ export default class Notes {
// Submission failed, revert back to original note
// Submission failed, revert back to original note
$noteBodyText
.
html
(
escape
(
cachedNoteBodyText
));
$noteBodyText
.
html
(
escape
(
cachedNoteBodyText
));
$editingNote
.
removeClass
(
'
being-posted fade-in
'
);
$editingNote
.
removeClass
(
'
being-posted fade-in
'
);
$editingNote
.
find
(
'
.
fa.fa-
spinner
'
).
remove
();
$editingNote
.
find
(
'
.spinner
'
).
remove
();
// Show Flash message about failure
// Show Flash message about failure
this
.
updateNoteError
();
this
.
updateNoteError
();
...
...
changelogs/unreleased/rk4bir-master-patch-60164.yml
0 → 100644
View file @
f8f25b3a
---
title
:
Migrated from .fa-spinner to .spinner in 'app/assets/javascripts/notes.js
merge_request
:
24916
author
:
Raihan Kabir (gitlab/rk4bir)
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment