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
7b233ea8
Commit
7b233ea8
authored
Feb 03, 2015
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling improvement, add in a group, not into group.
parent
704922c8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
app/views/groups/_new_group_member.html.haml
app/views/groups/_new_group_member.html.haml
+1
-1
features/steps/admin/groups.rb
features/steps/admin/groups.rb
+1
-1
features/steps/groups.rb
features/steps/groups.rb
+1
-1
No files found.
app/views/admin/groups/show.html.haml
View file @
7b233ea8
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
%div
.prepend-top-10
%div
.prepend-top-10
=
select_tag
:access_level
,
options_for_select
(
GroupMember
.
access_level_roles
),
class:
"project-access-select select2"
=
select_tag
:access_level
,
options_for_select
(
GroupMember
.
access_level_roles
),
class:
"project-access-select select2"
%hr
%hr
=
button_tag
'Add users
in
to group'
,
class:
"btn btn-create"
=
button_tag
'Add users to group'
,
class:
"btn btn-create"
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
%h3
.panel-title
%h3
.panel-title
...
...
app/views/groups/_new_group_member.html.haml
View file @
7b233ea8
...
@@ -12,4 +12,4 @@
...
@@ -12,4 +12,4 @@
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
.form-actions
.form-actions
=
f
.
submit
'Add users
in
to group'
,
class:
"btn btn-create"
=
f
.
submit
'Add users to group'
,
class:
"btn btn-create"
features/steps/admin/groups.rb
View file @
7b233ea8
...
@@ -41,7 +41,7 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
...
@@ -41,7 +41,7 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
within
"#new_team_member"
do
within
"#new_team_member"
do
select
"Reporter"
,
from:
"access_level"
select
"Reporter"
,
from:
"access_level"
end
end
click_button
"Add users
in
to group"
click_button
"Add users to group"
end
end
step
'I should see "John Doe" in team list in every project as "Reporter"'
do
step
'I should see "John Doe" in team list in every project as "Reporter"'
do
...
...
features/steps/groups.rb
View file @
7b233ea8
...
@@ -34,7 +34,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -34,7 +34,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
select2
(
user
.
id
,
from:
"#user_ids"
,
multiple:
true
)
select2
(
user
.
id
,
from:
"#user_ids"
,
multiple:
true
)
select
"Reporter"
,
from:
"access_level"
select
"Reporter"
,
from:
"access_level"
end
end
click_button
"Add users
in
to group"
click_button
"Add users to group"
end
end
step
'I should see user "John Doe" in team list'
do
step
'I should see user "John Doe" in team list'
do
...
...
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