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
5ce1b52f
Commit
5ce1b52f
authored
Feb 25, 2020
by
Marvin Karegyeya
Committed by
Natalia Tepluhina
Feb 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve Migrate '.fa-spinner' to '.spinner' for 'app/views/projects/notes'
parent
e20c2574
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
app/views/projects/notes/_actions.html.haml
app/views/projects/notes/_actions.html.haml
+1
-3
changelogs/unreleased/Resolve-Migrate--fa-spinner-app-views-projects-notes.yml
.../Resolve-Migrate--fa-spinner-app-views-projects-notes.yml
+5
-0
No files found.
app/views/projects/notes/_actions.html.haml
View file @
5ce1b52f
...
...
@@ -29,8 +29,7 @@
":title"
=>
"buttonText"
,
":ref"
=>
"'button'"
}
=
icon
(
'spin spinner'
,
'v-if'
=>
'loading'
,
class:
'loading'
,
'aria-hidden'
=>
'true'
,
'aria-label'
=>
'Loading'
)
%div
{
'v-else'
=>
''
}
%div
%template
{
'v-if'
=>
'isResolved'
}
=
render
'shared/icons/icon_status_success_solid.svg'
%template
{
'v-else'
=>
''
}
...
...
@@ -40,7 +39,6 @@
-
if
note
.
emoji_awardable?
.note-actions-item
=
button_tag
title:
'Add reaction'
,
class:
"note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn btn-transparent"
,
data:
{
position:
'right'
,
container:
'body'
}
do
=
icon
(
'spinner spin'
)
%span
{
class:
'link-highlight award-control-icon-neutral'
}=
sprite_icon
(
'slight-smile'
)
%span
{
class:
'link-highlight award-control-icon-positive'
}=
sprite_icon
(
'smiley'
)
%span
{
class:
'link-highlight award-control-icon-super-positive'
}=
sprite_icon
(
'smile'
)
...
...
changelogs/unreleased/Resolve-Migrate--fa-spinner-app-views-projects-notes.yml
0 → 100644
View file @
5ce1b52f
---
title
:
Remove spinner from app/views/projects/notes
merge_request
:
25015
author
:
nuwe1
type
:
other
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