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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8374d5a9
Commit
8374d5a9
authored
Jun 06, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group member information not collapsing in a single line
parent
5f092023
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
app/views/projects/project_members/_groups.html.haml
app/views/projects/project_members/_groups.html.haml
+1
-1
app/views/shared/members/_group.html.haml
app/views/shared/members/_group.html.haml
+9
-9
No files found.
app/views/projects/project_members/_groups.html.haml
View file @
8374d5a9
...
@@ -3,5 +3,5 @@
...
@@ -3,5 +3,5 @@
Groups with access to
Groups with access to
%strong
=
@project
.
name
%strong
=
@project
.
name
%span
.badge.badge-pill
=
group_links
.
size
%span
.badge.badge-pill
=
group_links
.
size
%ul
.content-list
%ul
.content-list
.members-list
=
render
partial:
'shared/members/group'
,
collection:
group_links
,
as: :group_link
=
render
partial:
'shared/members/group'
,
collection:
group_links
,
as: :group_link
app/views/shared/members/_group.html.haml
View file @
8374d5a9
...
@@ -5,16 +5,16 @@
...
@@ -5,16 +5,16 @@
%li
.member.group_member
{
id:
dom_id
}
%li
.member.group_member
{
id:
dom_id
}
%span
.list-item-name
%span
.list-item-name
=
group_icon
(
group
,
class:
"avatar s40"
,
alt:
''
)
=
group_icon
(
group
,
class:
"avatar s40"
,
alt:
''
)
%strong
.user-info
=
link_to
group
.
full_name
,
group_path
(
group
)
=
link_to
group
.
full_name
,
group_path
(
group
)
,
class:
'member'
.cgray
.cgray
Given access
#{
time_ago_with_tooltip
(
group_link
.
created_at
)
}
Given access
#{
time_ago_with_tooltip
(
group_link
.
created_at
)
}
-
if
group_link
.
expires?
-
if
group_link
.
expires?
·
·
%span
{
class:
(
'text-warning'
if
group_link
.
expires_soon?
)
}
%span
{
class:
(
'text-warning'
if
group_link
.
expires_soon?
)
}
Expires in
#{
distance_of_time_in_words_to_now
(
group_link
.
expires_at
)
}
Expires in
#{
distance_of_time_in_words_to_now
(
group_link
.
expires_at
)
}
.controls.member-controls
.controls.member-controls
=
form_tag
project_group_link_path
(
@project
,
group_link
),
method: :put
,
remote:
true
,
class:
'js-edit-member-form'
do
=
form_tag
project_group_link_path
(
@project
,
group_link
),
method: :put
,
remote:
true
,
class:
'js-edit-member-form
form-group row append-right-5
'
do
=
hidden_field_tag
"group_link[group_access]"
,
group_link
.
group_access
=
hidden_field_tag
"group_link[group_access]"
,
group_link
.
group_access
.member-form-control.dropdown.append-right-5
.member-form-control.dropdown.append-right-5
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
...
...
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