diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 12:08:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 12:08:30 +0000 |
| commit | 8487af81db7a2d490cbdd3ae16e87c44df883396 (patch) | |
| tree | c8ae57716a1198c701b17c48657745f58629e984 /app | |
| parent | 4370d68f034f66f8f0243d1de7f4c9c0330a3b79 (diff) | |
| parent | 587ee5fb80a21cda277240811372d7b694290592 (diff) | |
| download | gitlab-ce-8487af81db7a2d490cbdd3ae16e87c44df883396.tar.gz | |
Merge branch 'bugfix/dragging_milestones' into 'master'
Stop unauthorized users dragging on milestone page
Closes #13670
See merge request !7113
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/lists.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_issuable.html.haml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss index 76de3abe808..78464af94bd 100644 --- a/app/assets/stylesheets/framework/lists.scss +++ b/app/assets/stylesheets/framework/lists.scss @@ -38,7 +38,7 @@ &.smoke { background-color: $background-color; } - &:hover { + &:not(.ui-sort-disabled):hover { background: $row-hover; } diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml index 3c03c220ddd..9e1b0379428 100644 --- a/app/views/shared/milestones/_issuable.html.haml +++ b/app/views/shared/milestones/_issuable.html.haml @@ -3,8 +3,9 @@ - assignee = issuable.assignee - issuable_type = issuable.class.table_name - base_url_args = [project.namespace.becomes(Namespace), project, issuable_type] +- can_update = can?(current_user, :"update_#{issuable.to_ability_name}", issuable) -%li{ id: dom_id(issuable, 'sortable'), class: "issuable-row", 'data-iid' => issuable.iid, 'data-url' => polymorphic_path(issuable) } +%li{ id: dom_id(issuable, 'sortable'), class: "issuable-row #{'ui-sort-disabled' unless can_update}", 'data-iid' => issuable.iid, 'data-url' => polymorphic_path(issuable) } %span - if show_project_name %strong #{project.name} · |