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
b7db77c3
Commit
b7db77c3
authored
Feb 06, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'snippet-spam-fix' into 'master'
Don't render snippet actions for logged-out users Closes #27708 See merge request !8995
parent
c691f876
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
23 deletions
+25
-23
_actions.html.haml
app/views/projects/snippets/_actions.html.haml
+2
-0
_actions.html.haml
app/views/snippets/_actions.html.haml
+23
-23
No files found.
app/views/projects/snippets/_actions.html.haml
View file @
b7db77c3
-
return
unless
current_user
.hidden-xs
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
=
link_to
edit_namespace_project_snippet_path
(
@project
.
namespace
,
@project
,
@snippet
),
class:
"btn btn-grouped"
do
...
...
app/views/snippets/_actions.html.haml
View file @
b7db77c3
-
return
unless
current_user
.hidden-xs
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
=
link_to
edit_snippet_path
(
@snippet
),
class:
"btn btn-grouped"
do
...
...
@@ -5,29 +7,27 @@
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
=
link_to
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-grouped btn-inverted btn-remove"
,
title:
'Delete Snippet'
do
Delete
-
if
current_user
=
link_to
new_snippet_path
,
class:
"btn btn-grouped btn-inverted btn-create"
,
title:
"New snippet"
do
New snippet
=
link_to
new_snippet_path
,
class:
"btn btn-grouped btn-inverted btn-create"
,
title:
"New snippet"
do
New snippet
-
if
@snippet
.
submittable_as_spam?
&&
current_user
.
admin?
=
link_to
'Submit as spam'
,
mark_as_spam_snippet_path
(
@snippet
),
method: :post
,
class:
'btn btn-grouped btn-spam'
,
title:
'Submit as spam'
-
if
current_user
.visible-xs-block.dropdown
%button
.btn.btn-default.btn-block.append-bottom-0.prepend-top-5
{
data:
{
toggle:
"dropdown"
}
}
Options
=
icon
(
'caret-down'
)
.dropdown-menu.dropdown-menu-full-width
%ul
.visible-xs-block.dropdown
%button
.btn.btn-default.btn-block.append-bottom-0.prepend-top-5
{
data:
{
toggle:
"dropdown"
}
}
Options
=
icon
(
'caret-down'
)
.dropdown-menu.dropdown-menu-full-width
%ul
%li
=
link_to
new_snippet_path
,
title:
"New snippet"
do
New snippet
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
%li
=
link_to
new_snippet_path
,
title:
"New snippet"
do
New snippet
-
if
can?
(
current_user
,
:admin_personal_snippet
,
@snippet
)
%li
=
link_to
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
title:
'Delete Snippet'
do
Delete
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
%li
=
link_to
edit_snippet_path
(
@snippet
)
do
Edit
-
if
@snippet
.
submittable_as_spam?
&&
current_user
.
admin?
%li
=
link_to
'Submit as spam'
,
mark_as_spam_snippet_path
(
@snippet
),
method: :post
=
link_to
snippet_path
(
@snippet
),
method: :delete
,
data:
{
confirm:
"Are you sure?"
},
title:
'Delete Snippet'
do
Delete
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
%li
=
link_to
edit_snippet_path
(
@snippet
)
do
Edit
-
if
@snippet
.
submittable_as_spam?
&&
current_user
.
admin?
%li
=
link_to
'Submit as spam'
,
mark_as_spam_snippet_path
(
@snippet
),
method: :post
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