summaryrefslogtreecommitdiff
path: root/app/views/users/show.html.haml
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-01-12 14:15:59 -0500
committerJosh Frye <joshfng@gmail.com>2016-01-16 10:49:51 -0500
commit2d3655cd1403d354717ee4cb704c35a061e4b561 (patch)
tree89d15f067e1edb81e4cba3332a38287376329d00 /app/views/users/show.html.haml
parentc70ed7f2cdc0fbecea739a08332529b71325938c (diff)
downloadgitlab-ce-2d3655cd1403d354717ee4cb704c35a061e4b561.tar.gz
sanitize user supplied input.
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml25
1 files changed, 1 insertions, 24 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 7125b01c3ff..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
@@ -93,30 +93,7 @@
%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
- &nbsp;
- = 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