Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-10 15:08:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-10 15:08:59 +0300
commit7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch)
tree651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /app/views/users/show.html.haml
parentb4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index e10dad8aa8d..3c164588b13 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -130,7 +130,8 @@
%h4.prepend-top-20
= s_('UserProfile|Most Recent Activity')
.content_list{ data: { href: user_path } }
- = spinner
+ .loading
+ .spinner.spinner-md
- if profile_tab?(:groups)
#groups.tab-pane
@@ -152,8 +153,8 @@
#snippets.tab-pane
-# This tab is always loaded via AJAX
- .loading-status
- = spinner
+ .loading.hide
+ .spinner.spinner-md
- if profile_tabs.empty?
.row