summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-10 02:01:39 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-10 02:01:39 -0700
commit19f505a73525b5559f04761707566ebb157fe9b6 (patch)
tree81d05e180126be59e875f4a8d1edb1c49cf02dc7 /app
parent238d24fca9033633f30ad4f1e900c221a6cd19d8 (diff)
parent65e8b18190428b6fbb9db9d0b8ab19de533aa0d9 (diff)
downloadgitlab-ce-19f505a73525b5559f04761707566ebb157fe9b6.tar.gz
Merge pull request #3557 from rgbkrk/grammar-showdown
s/was/were/ for plural subjects
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/groups_controller.rb2
-rw-r--r--app/controllers/admin/teams/members_controller.rb2
-rw-r--r--app/controllers/groups_controller.rb2
-rw-r--r--app/controllers/teams/members_controller.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index f552fb595b8..df520bea773 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -69,7 +69,7 @@ class Admin::GroupsController < Admin::ApplicationController
def project_teams_update
@group.add_users_to_project_teams(params[:user_ids], params[:project_access])
- redirect_to [:admin, @group], notice: 'Users was successfully added.'
+ redirect_to [:admin, @group], notice: 'Users were successfully added.'
end
def destroy
diff --git a/app/controllers/admin/teams/members_controller.rb b/app/controllers/admin/teams/members_controller.rb
index a5a60307b51..590617f67c9 100644
--- a/app/controllers/admin/teams/members_controller.rb
+++ b/app/controllers/admin/teams/members_controller.rb
@@ -11,7 +11,7 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
user_team.add_members(user_ids, access, is_admin)
end
- redirect_to admin_team_path(user_team), notice: 'Members was successfully added into Team of users.'
+ redirect_to admin_team_path(user_team), notice: 'Members were successfully added into Team of users.'
end
def edit
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index bdf3567fef2..8976262f4f7 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -73,7 +73,7 @@ class GroupsController < ApplicationController
def team_members
@group.add_users_to_project_teams(params[:user_ids], params[:project_access])
- redirect_to people_group_path(@group), notice: 'Users was successfully added.'
+ redirect_to people_group_path(@group), notice: 'Users were successfully added.'
end
def edit
diff --git a/app/controllers/teams/members_controller.rb b/app/controllers/teams/members_controller.rb
index 8af27e0aeec..8ef786d1a66 100644
--- a/app/controllers/teams/members_controller.rb
+++ b/app/controllers/teams/members_controller.rb
@@ -18,7 +18,7 @@ class Teams::MembersController < Teams::ApplicationController
user_team.add_members(user_ids, access, is_admin)
end
- redirect_to team_members_path(user_team), notice: 'Members was successfully added into Team of users.'
+ redirect_to team_members_path(user_team), notice: 'Members were successfully added into Team of users.'
end
def edit