Autofill abuse message text with user url. Closes #2838
This commit is contained in:
		
							parent
							
								
									5cd2f77769
								
							
						
					
					
						commit
						c70ed7f2cd
					
				|  | @ -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 = AbuseReport.new | ||||
|     @abuse_report.user_id = params[:user_id] | ||||
|     @ref_url = params.fetch(:ref_url, '') | ||||
|   end | ||||
| 
 | ||||
|   def create | ||||
|  |  | |||
|  | @ -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: @ref_url | ||||
|       .help-block | ||||
|         Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment. | ||||
| 
 | ||||
|  |  | |||
|  | @ -93,7 +93,30 @@ | |||
|             %h4.center.light | ||||
|               %i.fa.fa-spinner.fa-spin | ||||
|         .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 | ||||
|       = spinner | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue