Fix a lot of stuff related to membership refactoring

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/models/ldap_group_link.rb

@@ -4,7 +4,7 @@ class LdapGroupLink < ActiveRecord::Base
 
   validates :cn, :group_access, :group_id, presence: true
   validates :cn, uniqueness: { scope: :group_id }
-  validates :group_access, inclusion: { in: UsersGroup.group_access_roles.values }
+  validates :group_access, inclusion: { in: Gitlab::Access.all_values }
 
   def access_field
     group_access

app/models/project_team.rb

@@ -152,7 +152,7 @@ class ProjectTeam
   def max_invited_level(user_id)
     project.project_group_links.map do |group_link|
       invited_group = group_link.group
-      access = invited_group.users_groups.find_by(user_id: user_id).try(:access_field)
+      access = invited_group.group_members.find_by(user_id: user_id).try(:access_field)
 
       # If group member has higher access level we should restrict it
       # to max allowed access level
@@ -174,10 +174,10 @@ class ProjectTeam
     if project.invited_groups.any?
       project.project_group_links.each do |group_link|
         invited_group = group_link.group
-        im = invited_group.users_groups
+        im = invited_group.group_members
 
         if level
-          int_level = UsersGroup.group_access_roles[level.to_s.singularize.titleize]
+          int_level = GroupMember.access_level_roles[level.to_s.singularize.titleize]
 
           # Skip group members if we ask for masters
           # but max group access is developers

app/views/ldap_group_links/_form.html.haml

@@ -17,11 +17,11 @@
           = f.label :group_access, class: 'control-label' do
             LDAP Access
           .col-sm-10
-            = f.select :group_access, options_for_select(UsersGroup.group_access_roles)
+            = f.select :group_access, options_for_select(GroupMember.access_level_roles)
             .help-block
               Default, minimum permission level for LDAP group members of #{group.name}.
               %br
               You can manage permission levels for individual group members in the Members tab.
 
       .form-actions
-        = f.submit 'Add synchronization', class: "btn btn-create"
\ No newline at end of file
+        = f.submit 'Add synchronization', class: "btn btn-create"

app/views/projects/team_members/_shared_group_members.html.haml

 - @project_group_links.each do |group_links|
   - shared_group = group_links.group
-  - shared_group_users_count = group_links.group.users_groups.count
+  - shared_group_users_count = group_links.group.group_members.count
   .panel.panel-default
     .panel-heading
       Shared with
@@ -12,8 +12,8 @@
         = link_to members_group_path(shared_group), class: 'btn btn-small' do
           %i.icon-edit
     %ul.well-list
-      - shared_group.users_groups.order('group_access DESC').limit(20).each do |member|
-        = render 'users_groups/users_group', member: member, show_controls: false, show_roles: false
+      - shared_group.group_members.order('access_level DESC').limit(20).each do |member|
+        = render 'groups/group_members/group_member', member: member, show_controls: false, show_roles: false
       - if shared_group_users_count > 20
         %li
           and #{shared_group_users_count - 20} more. For full list visit #{link_to 'group members page', members_group_path(shared_group)}