summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-06 15:15:17 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-06 15:15:17 +0200
commited7a8c9221fe544afb666e2b10672c759c821507 (patch)
treec491a07bb04e148a9b37c864f9c5363058a89d1a /app
parent4ba26988101b502742a17cd47cc5634c28de2d03 (diff)
downloadgitlab-ce-ed7a8c9221fe544afb666e2b10672c759c821507.tar.gz
Improve wording in abuse report form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/controllers/abuse_reports_controller.rb3
-rw-r--r--app/views/abuse_reports/new.html.haml6
2 files changed, 4 insertions, 5 deletions
diff --git a/app/controllers/abuse_reports_controller.rb b/app/controllers/abuse_reports_controller.rb
index 757be5ef727..65dbd5ef551 100644
--- a/app/controllers/abuse_reports_controller.rb
+++ b/app/controllers/abuse_reports_controller.rb
@@ -9,7 +9,8 @@ class AbuseReportsController < ApplicationController
@abuse_report.reporter = current_user
if @abuse_report.save
- redirect_to root_path, notice: 'Thank you for report. GitLab administrator will be able to see it'
+ message = "Thank you for your report. A GitLab administrator will look into it shortly."
+ redirect_to root_path, notice: message
else
render :new
end
diff --git a/app/views/abuse_reports/new.html.haml b/app/views/abuse_reports/new.html.haml
index 26a569222b4..a3b34345a3c 100644
--- a/app/views/abuse_reports/new.html.haml
+++ b/app/views/abuse_reports/new.html.haml
@@ -1,6 +1,6 @@
- page_title "Report abuse"
%h3.page-title Report abuse
-%p Please use this form if user makes spam or inappropriate content
+%p Please use this form to report users who create spam issues or comments or who otherwise behave inappropriately.
%hr
= form_for @abuse_report, html: { class: 'form-horizontal'} do |f|
= f.hidden_field :user_id
@@ -18,9 +18,7 @@
.col-sm-10
= f.text_area :message, class: "form-control", rows: 2, required: true
.help-block
- Explain the problem with this account.
- %br
- If user sends spam please provide a link to spam issue or comment
+ Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.
.form-actions
= f.submit "Send report", class: "btn btn-create"