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
789faf30
Commit
789faf30
authored
Oct 22, 2020
by
Marvin Karegyeya
Committed by
Ezekiel Kigbo
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve Migrate '.fa-spinner' to '.spinner' for 'app/helpers'
parent
8a152be0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
22 deletions
+11
-22
app/helpers/dropdowns_helper.rb
app/helpers/dropdowns_helper.rb
+2
-3
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+0
-9
app/helpers/services_helper.rb
app/helpers/services_helper.rb
+0
-7
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+2
-1
changelogs/unreleased/Resolve-Migrate--fa-spinner-app-helpers.yml
...gs/unreleased/Resolve-Migrate--fa-spinner-app-helpers.yml
+5
-0
spec/helpers/dropdowns_helper_spec.rb
spec/helpers/dropdowns_helper_spec.rb
+2
-2
No files found.
app/helpers/dropdowns_helper.rb
View file @
789faf30
...
...
@@ -129,8 +129,7 @@ module DropdownsHelper
end
def
dropdown_loading
content_tag
:div
,
class:
"dropdown-loading"
do
icon
(
'spinner spin'
)
end
spinner
=
loading_icon
(
container:
true
,
size:
"md"
,
css_class:
"gl-mt-7"
)
content_tag
(
:div
,
spinner
,
class:
"dropdown-loading"
)
end
end
app/helpers/icons_helper.rb
View file @
789faf30
...
...
@@ -89,15 +89,6 @@ module IconsHelper
sprite_icon
(
name
,
css_class:
css_class
)
end
def
spinner
(
text
=
nil
,
visible
=
false
)
css_class
=
[
'loading'
]
css_class
<<
'hide'
unless
visible
content_tag
:div
,
class:
css_class
.
join
(
' '
)
do
icon
(
'spinner spin'
)
+
text
end
end
def
boolean_to_icon
(
value
)
if
value
sprite_icon
(
'check'
,
css_class:
'cgreen'
)
...
...
app/helpers/services_helper.rb
View file @
789faf30
...
...
@@ -35,13 +35,6 @@ module ServicesHelper
"
#{
event
}
_events"
end
def
service_save_button
(
disabled:
false
)
button_tag
(
class:
'btn btn-success'
,
type:
'submit'
,
disabled:
disabled
,
data:
{
qa_selector:
'save_changes_button'
})
do
icon
(
'spinner spin'
,
class:
'hidden js-btn-spinner'
)
+
content_tag
(
:span
,
'Save changes'
,
class:
'js-btn-label'
)
end
end
def
scoped_integrations_path
if
@project
.
present?
project_settings_integrations_path
(
@project
)
...
...
app/views/projects/commits/show.html.haml
View file @
789faf30
...
...
@@ -34,4 +34,5 @@
%div
{
id:
dom_id
(
@project
)
}
%ol
#commits-list
.list-unstyled.content_list
=
render
'commits'
,
project:
@project
,
ref:
@ref
=
spinner
.loading.hide
=
loading_icon
(
size:
"lg"
)
changelogs/unreleased/Resolve-Migrate--fa-spinner-app-helpers.yml
0 → 100644
View file @
789faf30
---
title
:
Migrate .fa-spinner to .spinner for app/helpers
merge_request
:
25033
author
:
nuwe1
type
:
other
spec/helpers/dropdowns_helper_spec.rb
View file @
789faf30
...
...
@@ -246,8 +246,8 @@ RSpec.describe DropdownsHelper do
expect
(
content
).
to
include
(
'dropdown-loading'
)
end
it
'returns a
n icon
in the content'
do
expect
(
content
.
scan
(
'icon'
).
count
).
to
eq
(
1
)
it
'returns a
gl-spinner
in the content'
do
expect
(
content
).
to
include
(
'gl-spinner'
)
end
end
end
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