Rename Group#people to Group#members

7 files changed, 10 insertions, 10 deletions

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 890b6a0ade2..d490233c2ec 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -30,7 +30,7 @@ class Dispatcher
         new Wall(project_id)
       when 'projects:teams:members:index'
         new TeamMembers()
-      when 'groups:people'
+      when 'groups:members'
         new GroupMembers()
       when 'projects:tree:show'
         new TreeView()
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 416bfa77af0..1190dd40b73 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -61,7 +61,7 @@ class GroupsController < ApplicationController
     end
   end
 
-  def people
+  def members
     @project = group.projects.find(params[:project_id]) if params[:project_id]
     @members = group.users_groups.order('group_access DESC')
     @users_group = UsersGroup.new
diff --git a/app/controllers/users_groups_controller.rb b/app/controllers/users_groups_controller.rb
index c30034d7d0e..36eb8dbbfa4 100644
--- a/app/controllers/users_groups_controller.rb
+++ b/app/controllers/users_groups_controller.rb
@@ -9,7 +9,7 @@ class UsersGroupsController < ApplicationController
   def create
     @group.add_users(params[:user_ids].split(','), params[:group_access])
 
-    redirect_to people_group_path(@group), notice: 'Users were successfully added.'
+    redirect_to members_group_path(@group), notice: 'Users were successfully added.'
   end
 
   def update
@@ -21,7 +21,7 @@ class UsersGroupsController < ApplicationController
     @users_group.destroy unless @users_group.user == @group.owner
 
     respond_to do |format|
-      format.html { redirect_to people_group_path(@group), notice: 'User was  successfully removed from group.' }
+      format.html { redirect_to members_group_path(@group), notice: 'User was  successfully removed from group.' }
       format.js { render nothing: true }
     end
   end
diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index 786a52a6011..87c9c3264e0 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -2,7 +2,7 @@
   %fieldset
     %legend= "New Group member(s) for #{@group.name}"
 
-    %h6 1. Choose people you want in the group
+    %h6 1. Choose users you want in the group
     .clearfix
       = f.label :user_ids, "People"
       .input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
@@ -13,6 +13,5 @@
       .input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
 
     .form-actions
-      = hidden_field_tag :redirect_to, people_group_path(@group)
       = f.submit 'Add users into group', class: "btn btn-create"
 
diff --git a/app/views/groups/people.html.haml b/app/views/groups/members.html.haml
index 5b595ad3584..bd84a5e7cf9 100644
--- a/app/views/groups/people.html.haml
+++ b/app/views/groups/members.html.haml
@@ -10,7 +10,8 @@
   .span6
     .ui-box
       %h5.title
-        #{@group.name} Group Members
+        %strong #{@group.name}
+        Group Members
         %small
           (#{@members.count})
       %ul.well-list
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index f3cdb5ac457..a8bb3b91559 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -10,8 +10,8 @@
     = link_to merge_requests_group_path(@group) do
       Merge Requests
       %span.count= current_user.cared_merge_requests.opened.of_group(@group).count
-  = nav_link(path: 'groups#people') do
-    = link_to "People", people_group_path(@group)
+  = nav_link(path: 'groups#members') do
+    = link_to "Members", members_group_path(@group)
 
   - if can?(current_user, :manage_group, @group)
     = nav_link(path: 'groups#edit') do
diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml
index 7d9333d38e6..e01072d99ad 100644
--- a/app/views/projects/team_members/_group_members.html.haml
+++ b/app/views/projects/team_members/_group_members.html.haml
@@ -3,7 +3,7 @@
     %strong #{@group.name} Group
     members (#{@group.users_groups.count})
     .pull-right
-      = link_to people_group_path(@group), class: 'btn btn-small' do
+      = link_to members_group_path(@group), class: 'btn btn-small' do
         %i.icon-edit
   %ul.well-list
     - @group.users_groups.order('group_access DESC').each do |member|