diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-07 15:23:30 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-07 15:23:30 +0300 |
| commit | bb482389308065bc0c07a8023c153f01d3c34990 (patch) | |
| tree | 4254de5942c59324784b0f1341f0f47b1bb0f670 /app/views | |
| parent | fca174722c2c859ce6ef6c7cbbfeea3c7d1d7f74 (diff) | |
| parent | 33cfeea1766602e4b390e841673b0516c593874a (diff) | |
Merge branch '54981-extended-user-centric-tooltips-add-missing-cases' into 'master'
Resolve "Extended user centric tooltips: Add missing cases"
Closes #54981
See merge request gitlab-org/gitlab-ce!24132
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/users/_user.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/snippets/_snippet.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml index b2163ee85fa..a4e2c3252af 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -3,7 +3,7 @@ = image_tag avatar_icon_for_user(user), class: "avatar", alt: '' .row-main-content .user-name.row-title.str-truncated-100 - = link_to user.name, [:admin, user] + = link_to user.name, [:admin, user], class: "js-user-link", data: { user_id: user.id } - if user.blocked? %span.badge.badge-danger blocked - if user.admin? diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 6b3841ebbc4..2db1f67a793 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -10,7 +10,7 @@ - if user = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: '' .user-info - = link_to user.name, user_path(user), class: 'member' + = link_to user.name, user_path(user), class: 'member js-user-link', data: { user_id: user.id } = user_status(user) %span.cgray= user.to_reference diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index 5069e2e4ca6..42af97bc6af 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -25,7 +25,7 @@ #{snippet.to_reference} · authored #{time_ago_with_tooltip(snippet.created_at, placement: 'bottom', html_class: 'snippet-created-ago')} by - = link_to user_snippets_path(snippet.author) do + = link_to user_snippets_path(snippet.author), class: "js-user-link", data: { user_id: snippet.author.id } do = snippet.author_name - if link_project && snippet.project_id? %span.d-none.d-sm-inline-block |