GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit b6e1df7a authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'abuse-autofill-message' into 'master'

Autofill abuse message text with user url. Closes #2838

See merge request !2396
parents 5cd2f777 2d3655cd
......@@ -57,6 +57,7 @@ v 8.4.0 (unreleased)
- Autosize Markdown textareas
- Import GitHub wiki into GitLab
- 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
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
......@@ -2,6 +2,7 @@ class AbuseReportsController < ApplicationController
def new
@abuse_report =
@abuse_report.user_id = params[:user_id]
@ref_url = params.fetch(:ref_url, '')
def create
......@@ -16,7 +16,7 @@
= f.label :message, class: 'control-label'
= 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: sanitize(@ref_url)
Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.
......@@ -20,7 +20,7 @@
data: { toggle: 'tooltip', placement: 'left', container: 'body' }}
= icon('exclamation-circle')
- else
= link_to new_abuse_report_path(user_id:, class: 'btn btn-gray',
= link_to new_abuse_report_path(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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment