Commit 4b50cb7a authored by Clement Ho's avatar Clement Ho

Fix conflicts

parent 86e77ceb
......@@ -53,18 +53,13 @@
.controls.member-controls
= render 'shared/members/ee/ldap_tag', can_override: can_override_member, visible: false
- if show_controls && member.source == current_resource
<<<<<<< HEAD
- if user != current_user && (can_admin_member || can_override_member)
=======
- if member.invite? && can?(current_user, action_member_permission(:admin, member), member.source)
= link_to icon('paper-plane'), polymorphic_path([:resend_invite, member]),
method: :post,
class: 'btn btn-default prepend-left-10 hidden-xs',
title: 'Resend invite'
- if user != current_user && can_admin_member
>>>>>>> 8e55acb... Improve members view on mobile
- if user != current_user && (can_admin_member || can_override_member)
= form_for member, remote: true, html: { class: 'form-horizontal js-edit-member-form' } do |f|
= f.hidden_field :access_level
.member-form-control.dropdown.append-right-5
......@@ -100,9 +95,9 @@
method: :post,
class: 'btn btn-success prepend-left-10',
title: 'Grant access' do
%span{ class: ('visible-xs-block' if force_mobile_view == false) }
%span{ class: ('visible-xs-block' unless force_mobile_view) }
Grant access
- if force_mobile_view == false
- unless force_mobile_view
= icon('check inverse', class: 'hidden-xs')
- if can?(current_user, action_member_permission(:destroy, member), member)
......@@ -118,15 +113,11 @@
data: { confirm: remove_member_message(member) },
class: 'btn btn-remove prepend-left-10',
title: remove_member_title(member) do
%span{ class: ('visible-xs-block' if force_mobile_view == false) }
%span{ class: ('visible-xs-block' unless force_mobile_view) }
Delete
<<<<<<< HEAD
= icon('trash', class: 'hidden-xs')
= render 'shared/members/ee/override_member_buttons', group: @group, member: member, user: user, action: :edit, can_override: can_override_member
=======
- if force_mobile_view == false
- unless force_mobile_view
= icon('trash', class: 'hidden-xs')
>>>>>>> 8e55acb... Improve members view on mobile
= render 'shared/members/ee/override_member_buttons', group: @group, member: member, user: user, action: :edit, can_override: can_override_member
- else
%span.member-access-text= member.human_access
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment