diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-30 12:03:35 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-20 07:28:28 +0800 |
| commit | 95aae95a1cbb55facd127c74d6c044b13533f3fe (patch) | |
| tree | 6ecf27a219ee09f9e9d294d8304df2cb93c4da3d /app/views/shared/issuable/_sidebar_assignees.html.haml | |
| parent | 48d2c02efe7697914591d7381ce1c72d68eed336 (diff) | |
| download | gitlab-ce-95aae95a1cbb55facd127c74d6c044b13533f3fe.tar.gz | |
Code style changes and refactor
Diffstat (limited to 'app/views/shared/issuable/_sidebar_assignees.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_sidebar_assignees.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml index 99dc58b582f..c5cce1823f0 100644 --- a/app/views/shared/issuable/_sidebar_assignees.html.haml +++ b/app/views/shared/issuable/_sidebar_assignees.html.haml @@ -1,6 +1,6 @@ - issuable_type = issuable_sidebar[:type] -- signed_in = issuable_sidebar[:signed_in] -- can_edit_issuable = issuable_sidebar[:can_edit] +- signed_in = !!issuable_sidebar.dig(:current_user, :id) +- can_edit_issuable = issuable_sidebar.dig(:current_user, :can_edit) - if issuable_type == "issue" #js-vue-sidebar-assignees{ data: { field: "#{issuable_type}[assignee_ids]", signed_in: signed_in } } @@ -25,7 +25,7 @@ .value.hide-collapsed - if issuable_sidebar[:assignee] = link_to_member(@project, assignee, size: 32, extra_class: 'bold') do - - if issuable_sidebar[:can_merge] + - if issuable_sidebar[:assignee][:can_merge] %span.float-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: _('Not allowed to merge') } = icon('exclamation-triangle', 'aria-hidden': 'true') %span.username |