summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kumanyaev <me@zzet.org>2012-12-26 14:17:53 +0400
committerAndrey Kumanyaev <me@zzet.org>2012-12-26 19:52:15 +0400
commit1e3d238910fedb4c7de15a4c2f3537f0243059e4 (patch)
tree1690f3d95ccc6e9b017cfb223955949c9b569086
parent2753cea75a89ef461a1df1c82c09d093ec0bc1bb (diff)
downloadgitlab-ce-1e3d238910fedb4c7de15a4c2f3537f0243059e4.tar.gz
Replace short loop variable from "p" to "project"
-rw-r--r--app/controllers/admin/groups_controller.rb4
-rw-r--r--app/controllers/groups_controller.rb4
-rw-r--r--app/views/admin/groups/show.html.haml6
3 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index e41164d54c6..6167c454e66 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -68,8 +68,8 @@ class Admin::GroupsController < AdminController
end
def project_teams_update
- @group.projects.each do |p|
- p.add_users_ids_to_team(params[:user_ids], params[:project_access])
+ @group.projects.each do |project|
+ project.add_users_ids_to_team(params[:user_ids], params[:project_access])
end
redirect_to [:admin, @group], notice: 'Users was successfully added.'
end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 1b16d706c1e..5a4595270c1 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -59,8 +59,8 @@ class GroupsController < ApplicationController
end
def team_members
- @group.projects.each do |p|
- p.add_users_ids_to_team(params[:user_ids], params[:project_access])
+ @group.projects.each do |project|
+ project.add_users_ids_to_team(params[:user_ids], params[:project_access])
end
redirect_to people_group_path(@group), notice: 'Users was successfully added.'
end
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml
index e23fea3a3e6..86850722de8 100644
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@@ -76,9 +76,9 @@
%tr{class: "user_#{u.id}"}
%td.name= link_to u.name, admin_user_path(u)
%td.projects_access
- - u.projects.in_group(@group).each do |p|
- - u_p = u.users_projects.in_project(p).first
- = "#{p.name} (#{link_to u_p.project_access_human, edit_admin_team_member_path(u_p) })".html_safe
+ - u.projects.in_group(@group).each do |project|
+ - u_p = u.users_projects.in_project(project).first
+ = "#{project.name} (#{link_to u_p.project_access_human, edit_admin_team_member_path(u_p) })".html_safe
%tr
%td.input= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
%td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"}