diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-16 20:05:11 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-16 20:07:12 +0300 |
| commit | 3a77f4d1a99a07ddc9143f8c75b7810d18409946 (patch) | |
| tree | 0b18363d144b5ae079736443652d7d79c2069749 /app/views | |
| parent | 1c233ff5fed15014f62caeba7f256a1900f7f8a4 (diff) | |
Merge branch 'abuse-autofill-message' into 'master'
Autofill abuse message text with user url. Closes #2838
See merge request !2396
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/abuse_reports/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |