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
9a365876
Commit
9a365876
authored
Mar 08, 2022
by
wortschi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate spinners in user's overview
Changelog: changed
parent
721f11de
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
app/views/users/_overview.html.haml
app/views/users/_overview.html.haml
+3
-5
No files found.
app/views/users/_overview.html.haml
View file @
9a365876
...
...
@@ -3,7 +3,7 @@
.row.d-none.d-sm-flex
.col-12.calendar-block.gl-my-3
.user-calendar.light
{
data:
{
calendar_path:
user_calendar_path
(
@user
,
:json
),
calendar_activities_path:
user_calendar_activities_path
,
utc_offset:
local_timezone_instance
(
@user
.
timezone
).
now
.
utc_offset
}
}
.gl-spinner.gl-spinner-md.gl-my-8
=
gl_loading_icon
(
size:
'md'
,
css_class:
'gl-my-8'
)
.user-calendar-error.invisible
=
_
(
'There was an error loading users activity calendar.'
)
%a
.js-retry-load
{
href:
'#'
}
...
...
@@ -35,8 +35,7 @@
=
Feature
.
enabled?
(
:security_auto_fix
)
&&
@user
.
bot?
?
s_
(
'UserProfile|Bot activity'
)
:
s_
(
'UserProfile|Activity'
)
=
link_to
s_
(
'UserProfile|View all'
),
user_activity_path
,
class:
"hide js-view-all"
.overview-content-list
{
data:
{
href:
user_activity_path
,
qa_selector:
'user_activity_content'
}
}
.center.light.loading
.gl-spinner.gl-spinner-md
=
gl_loading_icon
(
size:
'md'
,
css_class:
'loading'
)
-
unless
Feature
.
enabled?
(
:security_auto_fix
)
&&
@user
.
bot?
.col-md-12.col-lg-6
...
...
@@ -47,5 +46,4 @@
=
s_
(
'UserProfile|Personal projects'
)
=
link_to
s_
(
'UserProfile|View all'
),
user_projects_path
,
class:
"hide js-view-all"
.overview-content-list
{
data:
{
href:
user_projects_path
}
}
.center.light.loading
.gl-spinner.gl-spinner-md
=
gl_loading_icon
(
size:
'md'
,
css_class:
'loading'
)
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