Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
19f505a7
Commit
19f505a7
authored
Apr 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3557 from rgbkrk/grammar-showdown
s/was/were/ for plural subjects
parents
238d24fc
65e8b181
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+1
-1
app/controllers/admin/teams/members_controller.rb
app/controllers/admin/teams/members_controller.rb
+1
-1
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/controllers/teams/members_controller.rb
app/controllers/teams/members_controller.rb
+1
-1
No files found.
app/controllers/admin/groups_controller.rb
View file @
19f505a7
...
@@ -69,7 +69,7 @@ class Admin::GroupsController < Admin::ApplicationController
...
@@ -69,7 +69,7 @@ class Admin::GroupsController < Admin::ApplicationController
def
project_teams_update
def
project_teams_update
@group
.
add_users_to_project_teams
(
params
[
:user_ids
],
params
[
:project_access
])
@group
.
add_users_to_project_teams
(
params
[
:user_ids
],
params
[
:project_access
])
redirect_to
[
:admin
,
@group
],
notice:
'Users w
as
successfully added.'
redirect_to
[
:admin
,
@group
],
notice:
'Users w
ere
successfully added.'
end
end
def
destroy
def
destroy
...
...
app/controllers/admin/teams/members_controller.rb
View file @
19f505a7
...
@@ -11,7 +11,7 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
...
@@ -11,7 +11,7 @@ class Admin::Teams::MembersController < Admin::Teams::ApplicationController
user_team
.
add_members
(
user_ids
,
access
,
is_admin
)
user_team
.
add_members
(
user_ids
,
access
,
is_admin
)
end
end
redirect_to
admin_team_path
(
user_team
),
notice:
'Members w
as
successfully added into Team of users.'
redirect_to
admin_team_path
(
user_team
),
notice:
'Members w
ere
successfully added into Team of users.'
end
end
def
edit
def
edit
...
...
app/controllers/groups_controller.rb
View file @
19f505a7
...
@@ -73,7 +73,7 @@ class GroupsController < ApplicationController
...
@@ -73,7 +73,7 @@ class GroupsController < ApplicationController
def
team_members
def
team_members
@group
.
add_users_to_project_teams
(
params
[
:user_ids
],
params
[
:project_access
])
@group
.
add_users_to_project_teams
(
params
[
:user_ids
],
params
[
:project_access
])
redirect_to
people_group_path
(
@group
),
notice:
'Users w
as
successfully added.'
redirect_to
people_group_path
(
@group
),
notice:
'Users w
ere
successfully added.'
end
end
def
edit
def
edit
...
...
app/controllers/teams/members_controller.rb
View file @
19f505a7
...
@@ -18,7 +18,7 @@ class Teams::MembersController < Teams::ApplicationController
...
@@ -18,7 +18,7 @@ class Teams::MembersController < Teams::ApplicationController
user_team
.
add_members
(
user_ids
,
access
,
is_admin
)
user_team
.
add_members
(
user_ids
,
access
,
is_admin
)
end
end
redirect_to
team_members_path
(
user_team
),
notice:
'Members w
as
successfully added into Team of users.'
redirect_to
team_members_path
(
user_team
),
notice:
'Members w
ere
successfully added into Team of users.'
end
end
def
edit
def
edit
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment