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
8923ecc5
Commit
8923ecc5
authored
Jan 27, 2021
by
Yogi
Committed by
Kushal Pandya
Jan 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new GitLab UI for report abuse button
parent
e1c35852
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+3
-2
changelogs/unreleased/yo-gl-button-ra.yml
changelogs/unreleased/yo-gl-button-ra.yml
+5
-0
No files found.
app/views/users/show.html.haml
View file @
8923ecc5
...
@@ -22,11 +22,12 @@
...
@@ -22,11 +22,12 @@
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
}
>
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
}
>
=
sprite_icon
(
'error'
)
=
sprite_icon
(
'error'
)
-
else
-
else
=
link_to
new_abuse_report_path
(
user_id:
@user
.
id
,
ref_url:
request
.
referrer
),
class:
link_classes
+
'btn gl-button'
,
=
link_to
new_abuse_report_path
(
user_id:
@user
.
id
,
ref_url:
request
.
referrer
),
class:
link_classes
+
'btn gl-button
btn-default
'
,
title:
s_
(
'UserProfile|Report abuse'
),
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
title:
s_
(
'UserProfile|Report abuse'
),
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'error'
)
=
sprite_icon
(
'error'
)
-
if
can?
(
current_user
,
:read_user_profile
,
@user
)
-
if
can?
(
current_user
,
:read_user_profile
,
@user
)
=
link_to
user_path
(
@user
,
rss_url_options
),
class:
link_classes
+
'btn gl-button btn-svg btn-default has-tooltip'
,
title:
s_
(
'UserProfile|Subscribe'
),
'aria-label'
:
'Subscribe'
do
=
link_to
user_path
(
@user
,
rss_url_options
),
class:
link_classes
+
'btn gl-button btn-default has-tooltip'
,
title:
s_
(
'UserProfile|Subscribe'
),
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
)
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
)
-
if
current_user
&&
current_user
.
admin?
-
if
current_user
&&
current_user
.
admin?
=
link_to
[
:admin
,
@user
],
class:
link_classes
+
'btn gl-button btn-default'
,
title:
s_
(
'UserProfile|View user in admin area'
),
=
link_to
[
:admin
,
@user
],
class:
link_classes
+
'btn gl-button btn-default'
,
title:
s_
(
'UserProfile|View user in admin area'
),
...
...
changelogs/unreleased/yo-gl-button-ra.yml
0 → 100644
View file @
8923ecc5
---
title
:
Apply new GitLab UI for report abuse button
merge_request
:
52049
author
:
Yogi (@yo)
type
:
fixed
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