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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6dbd60f6
Commit
6dbd60f6
authored
Jan 30, 2017
by
Nur Rony
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace words user(s) with member(s)
parent
b525aff6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/groups/group_members/_new_group_member.html.haml
app/views/groups/group_members/_new_group_member.html.haml
+2
-2
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+3
-3
No files found.
app/views/groups/group_members/_new_group_member.html.haml
View file @
6dbd60f6
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.col-md-4.col-lg-6
.col-md-4.col-lg-6
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-clamp'
,
scope: :all
,
email_user:
true
)
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
'input-clamp'
,
scope: :all
,
email_user:
true
)
.help-block.append-bottom-10
.help-block.append-bottom-10
Search for
us
ers by name, username, or email, or invite new ones using their email address.
Search for
memb
ers by name, username, or email, or invite new ones using their email address.
.col-md-3.col-lg-2
.col-md-3.col-lg-2
=
select_tag
:access_level
,
options_for_select
(
GroupMember
.
access_level_roles
,
@group_member
.
access_level
),
class:
"form-control project-access-select"
=
select_tag
:access_level
,
options_for_select
(
GroupMember
.
access_level_roles
,
@group_member
.
access_level
),
class:
"form-control project-access-select"
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
=
text_field_tag
:expires_at
,
nil
,
class:
'form-control js-access-expiration-date'
,
placeholder:
'Expiration date'
=
text_field_tag
:expires_at
,
nil
,
class:
'form-control js-access-expiration-date'
,
placeholder:
'Expiration date'
%i
.clear-icon.js-clear-input
%i
.clear-icon.js-clear-input
.help-block.append-bottom-10
.help-block.append-bottom-10
On this date, the
us
er(s) will automatically lose access to this group and all of its projects.
On this date, the
memb
er(s) will automatically lose access to this group and all of its projects.
.col-md-2
.col-md-2
=
f
.
submit
'Add to group'
,
class:
"btn btn-create btn-block"
=
f
.
submit
'Add to group'
,
class:
"btn btn-create btn-block"
app/views/groups/group_members/index.html.haml
View file @
6dbd60f6
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
.project-members-new.append-bottom-default
.project-members-new.append-bottom-default
%p
.clearfix
%p
.clearfix
Add new
us
er to
Add new
memb
er to
%strong
=
@group
.
name
%strong
=
@group
.
name
=
render
"new_group_member"
=
render
"new_group_member"
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
.append-bottom-default.clearfix
.append-bottom-default.clearfix
%h5
.member.existing-title
%h5
.member.existing-title
Existing
us
ers
Existing
memb
ers
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
=
render
'shared/members/sort_dropdown'
=
render
'shared/members/sort_dropdown'
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
Us
ers with access to
Memb
ers with access to
%strong
=
@group
.
name
%strong
=
@group
.
name
%span
.badge
=
@members
.
total_count
%span
.badge
=
@members
.
total_count
%ul
.content-list
%ul
.content-list
...
...
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