BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
be76e402
Commit
be76e402
authored
Jan 10, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'disable-blocked-in-abuse-reports' into 'master'
Disable "Already Blocked" button in admin abuse report page See merge request !2360
parents
c81647ae
5f6b0934
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
_abuse_report.html.haml
app/views/admin/abuse_reports/_abuse_report.html.haml
+1
-1
No files found.
app/views/admin/abuse_reports/_abuse_report.html.haml
View file @
be76e402
...
@@ -26,6 +26,6 @@
...
@@ -26,6 +26,6 @@
-
if
user
&&
!
user
.
blocked?
-
if
user
&&
!
user
.
blocked?
=
link_to
'Block user'
,
block_admin_user_path
(
user
),
data:
{
confirm:
'USER WILL BE BLOCKED! Are you sure?'
},
method: :put
,
class:
"btn btn-xs"
=
link_to
'Block user'
,
block_admin_user_path
(
user
),
data:
{
confirm:
'USER WILL BE BLOCKED! Are you sure?'
},
method: :put
,
class:
"btn btn-xs"
-
else
-
else
.btn.btn-xs
.btn.btn-xs
.disabled
Already Blocked
Already Blocked
=
link_to
'Remove report'
,
[
:admin
,
abuse_report
],
remote:
true
,
method: :delete
,
class:
"btn btn-xs btn-close js-remove-tr"
=
link_to
'Remove report'
,
[
:admin
,
abuse_report
],
remote:
true
,
method: :delete
,
class:
"btn btn-xs btn-close js-remove-tr"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment