Fix members page related conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/groups/group_members/_new_group_member.html.haml

-<<<<<<< HEAD
-= form_for @group_member, url: group_group_members_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
-  .form-group
-    = f.label :user_ids, "People", class: 'control-label'
-    .col-sm-10
-      = users_select_tag(:user_ids, multiple: true, class: 'input-large', scope: :all, email_user: true, skip_ldap: @group.ldap_synced?)
-      .help-block
-=======
 = form_for @group_member, url: group_group_members_path(@group), html: { class: 'users-project-form users-group-form' } do |f|
   .row
     .col-md-4.col-lg-6
-      = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true)
+      = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true, skip_ldap: @group.ldap_synced?)
       .help-block.append-bottom-10
->>>>>>> ce/master
         Search for users by name, username, or email, or invite new ones using their email address.
 
     .col-md-3.col-lg-2

app/views/groups/group_members/index.html.haml

@@ -13,10 +13,8 @@
 
     = render 'shared/members/requests', membership_source: @group, requesters: @requesters
 
-<<<<<<< HEAD
   = render 'ldap_sync'
 
-=======
   .append-bottom-default.clearfix
     %h5.member.existing-title
       Existing users
@@ -25,7 +23,6 @@
         = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
         %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
           = icon("search")
->>>>>>> ce/master
   .panel.panel-default
     .panel-heading
       Users with access to

app/views/projects/project_members/index.html.haml

 - page_title "Members"
 
-<<<<<<< HEAD
 - if membership_locked?
   .alert.alert-warning
     Adding new users is disabled at group level
 
-.project-members-page.js-project-members-page.prepend-top-default
-  - if can?(current_user, :admin_project_member, @project) && !membership_locked?
-    .panel.panel-default
-      .panel-heading
-        Add new user to project
-        .controls
-          = link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
-            Import members
-      .panel-body
-        %p.light
-          Users with access to this project are listed below.
-        = render "new_project_member"
-=======
 .project-members-page.prepend-top-default
   %h4.project-members-title.clearfix
     Members
     = link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default pull-right hidden-xs", title: "Import members from another project"
-  - if can?(current_user, :admin_project_member, @project)
+  - if can?(current_user, :admin_project_member, @project) && !membership_locked?
     .project-members-new.append-bottom-default
       %p.clearfix
         Add new user to
         %strong= @project.name
       = render "new_project_member"
->>>>>>> ce/master
 
       = render 'shared/members/requests', membership_source: @project, requesters: @requesters