Merge branch '7-4-pre' into 'master'

7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096

18 files changed, 44 insertions, 41 deletions

diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index 8634f46053d..d59d2a23179 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -62,7 +62,7 @@
           %div
             = users_select_tag(:user_ids, multiple: true)
           %div.prepend-top-10
-            = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2"
+            = select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
           %hr
           = submit_tag 'Add users into group', class: "btn btn-create"
     .panel.panel-default
@@ -70,7 +70,7 @@
         %h3.panel-title
           Members
           %span.badge
-            #{@group.users_groups.count}
+            #{@group.group_members.count}
       %ul.well-list.group-users-list
         - @members.each do |member|
           - user = member.user
@@ -80,7 +80,7 @@
                 = link_to user.name, admin_user_path(user)
             %span.pull-right.light
               = member.human_access
-              = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+              = link_to group_group_members_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
                 %i.icon-minus.icon-white
       .panel-footer
         = paginate @members, param_name: 'members_page', theme: 'gitlab'
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 66a72449f40..8413f0cb7f9 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -95,13 +95,13 @@
       .panel.panel-default
         .panel-heading
           %strong #{@group.name}
-          group members (#{@group.users_groups.count})
+          group members (#{@group.group_members.count})
           .pull-right
             = link_to admin_group_path(@group), class: 'btn btn-small' do
               %i.icon-edit
         %ul.well-list
           - @group_members.each do |member|
-            = render 'users_groups/users_group', member: member, show_controls: false
+            = render 'groups/group_members/group_member', member: member, show_controls: false
         .panel-footer
           = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab'
 
@@ -115,17 +115,17 @@
             %i.icon-edit
             Manage Access
       %ul.well-list.team_members
-        - @project_members.each do |users_project|
-          - user = users_project.user
-          %li.users_project
+        - @project_members.each do |project_member|
+          - user = project_member.user
+          %li.project_member
             .list-item-name
               %strong
                 = link_to user.name, admin_user_path(user)
             .pull-right
-              - if users_project.owner?
+              - if project_member.owner?
                 %span.light Owner
               - else
-                %span.light= users_project.human_access
+                %span.light= project_member.human_access
                 = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, remote: true, class: "btn btn-small btn-remove" do
                   %i.icon-remove
       .panel-footer
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index f60d40b5334..a172d12edb1 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -159,13 +159,13 @@
         = render 'users/profile', user: @user
 
   #groups.tab-pane
-    - if @user.users_groups.present?
+    - if @user.group_members.present?
       .panel.panel-default
         .panel-heading Groups:
         %ul.well-list
-          - @user.users_groups.each do |user_group|
+          - @user.group_members.each do |user_group|
             - group = user_group.group
-            %li.users_group
+            %li.group_member
               %span{class: ("list-item-name" unless user_group.owner?)}
                 %strong= link_to group.name, admin_group_path(group)
               .pull-right
@@ -197,7 +197,7 @@
           %ul.well-list
             - @joined_projects.sort_by(&:name_with_namespace).each do |project|
               - tm = project.team.find_tm(@user.id)
-              %li.users_project
+              %li.project_member
                 .list-item-name
                   = link_to admin_project_path(project), class: dom_class(project) do
                     = project.name_with_namespace
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml
index 030c961c355..eba2b63797a 100644
--- a/app/views/events/_event_issue.atom.haml
+++ b/app/views/events/_event_issue.atom.haml
@@ -1,2 +1,3 @@
 %div{xmlns: "http://www.w3.org/1999/xhtml"}
-  = markdown issue.description
+  - if issue.description.present?
+    = markdown issue.description
diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml
index ab3a485e908..0aea2d17d65 100644
--- a/app/views/events/_event_merge_request.atom.haml
+++ b/app/views/events/_event_merge_request.atom.haml
@@ -1,2 +1,3 @@
 %div{xmlns: "http://www.w3.org/1999/xhtml"}
-  = markdown merge_request.description
+  - if merge_request.description.present?
+    = markdown merge_request.description
diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index 3ab9276c541..e590ddbf931 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -1,11 +1,11 @@
-= form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
+= form_for @users_group, 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')
 
   .form-group
-    = f.label :group_access, "Group Access", class: 'control-label'
-    .col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select select2"
+    = f.label :access_level, "Group Access", class: 'control-label'
+    .col-sm-10= select_tag :access_level, options_for_select(GroupMember.access_level_roles, @users_group.access_level), class: "project-access-select select2"
 
   .form-actions
     = f.submit 'Add users into group', class: "btn btn-create"
diff --git a/app/views/users_groups/_users_group.html.haml b/app/views/groups/group_members/_group_member.html.haml
index ad363eaba23..099e50a384e 100644
--- a/app/views/users_groups/_users_group.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -21,11 +21,11 @@
             = link_to leave_profile_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
               %i.icon-minus.icon-white
           - else
-            = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+            = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
               %i.icon-minus.icon-white
 
     .edit-member.hide.js-toggle-content
       = form_for [@group, member], remote: true do |f|
         .alert.prepend-top-20
-          = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
+          = f.select :access_level, options_for_select(GroupMember.access_level_roles, member.access_level)
           = f.submit 'Save', class: 'btn btn-save btn-small'
diff --git a/app/views/users_groups/update.js.haml b/app/views/groups/group_members/update.js.haml
index 5bad48abafd..5bad48abafd 100644
--- a/app/views/users_groups/update.js.haml
+++ b/app/views/groups/group_members/update.js.haml
diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml
index 19819c96124..ebf407d4ef1 100644
--- a/app/views/groups/members.html.haml
+++ b/app/views/groups/members.html.haml
@@ -32,7 +32,7 @@
       (#{@members.total_count})
   %ul.well-list
     - @members.each do |member|
-      = render 'users_groups/users_group', member: member, show_roles: show_roles, show_controls: true
+      = render 'groups/group_members/group_member', member: member, show_roles: show_roles, show_controls: true
 = paginate @members, theme: 'gitlab'
 
 :coffeescript
diff --git a/app/views/notify/project_access_granted_email.html.haml b/app/views/notify/project_access_granted_email.html.haml
index ce34f825358..4596205f39b 100644
--- a/app/views/notify/project_access_granted_email.html.haml
+++ b/app/views/notify/project_access_granted_email.html.haml
@@ -1,5 +1,5 @@
 %p
-  = "You have been granted #{@users_project.human_access} access to project"
+  = "You have been granted #{@project_member.human_access} access to project"
 %p
   = link_to project_url(@project) do
     = @project.name_with_namespace
diff --git a/app/views/notify/project_access_granted_email.text.erb b/app/views/notify/project_access_granted_email.text.erb
index 66c57def375..de24feb802f 100644
--- a/app/views/notify/project_access_granted_email.text.erb
+++ b/app/views/notify/project_access_granted_email.text.erb
@@ -1,4 +1,4 @@
 
-You have been granted <%= @users_project.human_access %> access to project <%= @project.name_with_namespace %>
+You have been granted <%= @project_member.human_access %> access to project <%= @project.name_with_namespace %>
 
 <%= url_for(project_url(@project)) %>
diff --git a/app/views/profiles/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml
index 218d51d31af..940c553d1ba 100644
--- a/app/views/profiles/notifications/_settings.html.haml
+++ b/app/views/profiles/notifications/_settings.html.haml
@@ -6,7 +6,7 @@
       = notification_icon(notification)
 
   %span.str-truncated
-    - if membership.kind_of? UsersGroup
+    - if membership.kind_of? GroupMember
       = link_to membership.group.name, membership.group
     - else
       = link_to_project(membership.project)
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index efe9c032190..f84de4430cc 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -39,13 +39,13 @@
   .col-md-6
     %h4 Groups:
     %ul.bordered-list
-      - @users_groups.each do |users_group|
+      - @group_members.each do |users_group|
         - notification = Notification.new(users_group)
         = render 'settings', type: 'group', membership: users_group, notification: notification
 
   .col-md-6
     %h4 Projects:
     %ul.bordered-list
-      - @users_projects.each do |users_project|
-        - notification = Notification.new(users_project)
-        = render 'settings', type: 'project', membership: users_project, notification: notification
+      - @project_members.each do |project_member|
+        - notification = Notification.new(project_member)
+        = render 'settings', type: 'project', membership: project_member, notification: notification
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 5998e4c6b42..2bf61fa12bb 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -1,7 +1,7 @@
 %h3.page-title
   New project member(s)
 
-= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project), html: { class: "form-horizontal users-project-form" } do |f|
+= form_for @user_project_relation, as: :project_member, url: project_team_members_path(@project), html: { class: "form-horizontal users-project-form" } do |f|
   -if @user_project_relation.errors.any?
     .alert.alert-danger
       %ul
@@ -16,8 +16,8 @@
 
   %p 2. Set access level for them
   .form-group
-    = f.label :project_access, "Project Access", class: 'control-label'
-    .col-sm-10= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select select2"
+    = f.label :access_level, "Project Access", class: 'control-label'
+    .col-sm-10= select_tag :access_level, options_for_select(Gitlab::Access.options, @user_project_relation.access_level), class: "project-access-select select2"
 
   .form-actions
     = f.submit 'Add users', class: "btn btn-create"
diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml
index 83c4b6f87d5..77ffab89f37 100644
--- a/app/views/projects/team_members/_group_members.html.haml
+++ b/app/views/projects/team_members/_group_members.html.haml
@@ -1,4 +1,4 @@
-- group_users_count = @group.users_groups.count
+- group_users_count = @group.group_members.count
 .panel.panel-default
   .panel-heading
     %strong #{@group.name}
@@ -7,8 +7,8 @@
       = link_to members_group_path(@group), class: 'btn btn-small' do
         %i.icon-edit
   %ul.well-list
-    - @group.users_groups.order('group_access DESC').limit(20).each do |member|
-      = render 'users_groups/users_group', member: member, show_controls: false
+    - @group.group_members.order('access_level DESC').limit(20).each do |member|
+      = render 'groups/group_members/group_member', member: member, show_controls: false
     - if group_users_count > 20
       %li
         and #{group_users_count - 20} more. For full list visit #{link_to 'group members page', members_group_path(@group)}
diff --git a/app/views/projects/team_members/_team_member.html.haml b/app/views/projects/team_members/_team_member.html.haml
index d93bb44ab96..79b78665417 100644
--- a/app/views/projects/team_members/_team_member.html.haml
+++ b/app/views/projects/team_members/_team_member.html.haml
@@ -4,8 +4,8 @@
     - if current_user_can_admin_project
       - unless @project.personal? && user == current_user
         .pull-left
-          = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
-            = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
+          = form_for(member, as: :project_member, url: project_team_member_path(@project, member.user)) do |f|
+            = f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level), {}, class: "medium project-access-select span2 trigger-submit"
           &nbsp;
         = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
           %i.icon-minus.icon-white
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index ddb3b9d4a9d..ecb7c689e8a 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -11,6 +11,6 @@
 %p.light
   Read more about project permissions
   %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
-= render "team", members: @users_projects
+= render "team", members: @project_members
 - if @group
   = render "group_members"
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index 9d0292059d6..ec2701af0eb 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,6 +1,7 @@
 %article.readme-holder#README
-  %h4.readme-file-title
-    %i.icon-file
-    = readme.name
+  = link_to '#README' do
+    %h4.readme-file-title
+      %i.icon-file
+      = readme.name
   .wiki
     = render_readme(readme)