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
0
Merge Requests
0
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
Kazuhiko Shiozaki
gitlab-ce
Commits
c70ed7f2
Commit
c70ed7f2
authored
Jan 12, 2016
by
Josh Frye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Autofill abuse message text with user url. Closes #2838
parent
5cd2f777
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
1 deletion
+26
-1
CHANGELOG
CHANGELOG
+1
-0
app/controllers/abuse_reports_controller.rb
app/controllers/abuse_reports_controller.rb
+1
-0
app/views/abuse_reports/new.html.haml
app/views/abuse_reports/new.html.haml
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+23
-0
No files found.
CHANGELOG
View file @
c70ed7f2
...
@@ -57,6 +57,7 @@ v 8.4.0 (unreleased)
...
@@ -57,6 +57,7 @@ v 8.4.0 (unreleased)
- Autosize Markdown textareas
- Autosize Markdown textareas
- Import GitHub wiki into GitLab
- Import GitHub wiki into GitLab
- Add reporters ability to download and browse build artifacts (Andrew Johnson)
- Add reporters ability to download and browse build artifacts (Andrew Johnson)
- Autofill referring url in message box when reporting user abuse. (Josh Frye)
v 8.3.4
v 8.3.4
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
...
...
app/controllers/abuse_reports_controller.rb
View file @
c70ed7f2
...
@@ -2,6 +2,7 @@ class AbuseReportsController < ApplicationController
...
@@ -2,6 +2,7 @@ class AbuseReportsController < ApplicationController
def
new
def
new
@abuse_report
=
AbuseReport
.
new
@abuse_report
=
AbuseReport
.
new
@abuse_report
.
user_id
=
params
[
:user_id
]
@abuse_report
.
user_id
=
params
[
:user_id
]
@ref_url
=
params
.
fetch
(
:ref_url
,
''
)
end
end
def
create
def
create
...
...
app/views/abuse_reports/new.html.haml
View file @
c70ed7f2
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
.form-group
.form-group
=
f
.
label
:message
,
class:
'control-label'
=
f
.
label
:message
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
text_area
:message
,
class:
"form-control js-quick-submit"
,
rows:
2
,
required:
true
=
f
.
text_area
:message
,
class:
"form-control js-quick-submit"
,
rows:
2
,
required:
true
,
value:
@ref_url
.help-block
.help-block
Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.
Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.
...
...
app/views/users/show.html.haml
View file @
c70ed7f2
...
@@ -93,7 +93,30 @@
...
@@ -93,7 +93,30 @@
%h4
.center.light
%h4
.center.light
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
.user-calendar-activities
.user-calendar-activities
.cover-controls
-
if
@user
==
current_user
=
link_to
profile_path
,
class:
'btn btn-gray'
do
=
icon
(
'pencil'
)
-
elsif
current_user
%span
.report-abuse
-
if
@user
.
abuse_report
%button
.btn.btn-danger
{
title:
'Already reported for abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
,
container:
'body'
}}
=
icon
(
'exclamation-circle'
)
-
else
=
link_to
new_abuse_report_path
(
user_id:
@user
.
id
,
ref_url:
request
.
referrer
),
class:
'btn btn-gray'
,
title:
'Report abuse'
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
,
container:
'body'
}
do
=
icon
(
'exclamation-circle'
)
-
if
current_user
=
link_to
user_path
(
@user
,
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'btn btn-gray'
do
=
icon
(
'rss'
)
.gray-content-block.second-block
.user-calendar
%h4
.center.light
%i
.fa.fa-spinner.fa-spin
.user-calendar-activities
.content_list
.content_list
=
spinner
=
spinner
...
...
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