diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-16 17:05:11 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-16 17:05:11 +0000 |
| commit | b6e1df7ad4cc8854087355eececd0cd12e7eab74 (patch) | |
| tree | 89d15f067e1edb81e4cba3332a38287376329d00 | |
| parent | 5cd2f77769d968d10cc8e4371e88ff8be9f28c8c (diff) | |
| parent | 2d3655cd1403d354717ee4cb704c35a061e4b561 (diff) | |
| download | gitlab-ce-b6e1df7ad4cc8854087355eececd0cd12e7eab74.tar.gz | |
Merge branch 'abuse-autofill-message' into 'master'
Autofill abuse message text with user url. Closes #2838
See merge request !2396
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/abuse_reports_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/abuse_reports/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3995c3aa8e7..a15bbfbc49e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb index 38814459f66..2eac0cabf7a 100644 --- a/app/controllers/abuse_reports_controller.rb +++ b/app/controllers/abuse_reports_controller.rb @@ -2,6 +2,7 @@ class AbuseReportsController < ApplicationController def new @abuse_report = AbuseReport.new @abuse_report.user_id = params[:user_id] + @ref_url = params.fetch(:ref_url, '') end def create diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml index 3e5cdd2ce4a..f125ecf7be5 100644 --- a/app/views/abuse_reports/new.html.haml +++ b/app/views/abuse_reports/new.html.haml @@ -16,7 +16,7 @@ .form-group = f.label :message, class: 'control-label' .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: sanitize(@ref_url) .help-block Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment. diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 849304ee2b6..3bfd781e51d 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -20,7 +20,7 @@ data: { toggle: 'tooltip', placement: 'left', container: 'body' }} = icon('exclamation-circle') - else - = link_to new_abuse_report_path(user_id: @user.id), class: 'btn btn-gray', + = 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 |