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
dbb65c13
Commit
dbb65c13
authored
Jul 06, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-orphans' into 'master'
Remove orphaned haml files Closes #34779 See merge request !12690
parents
c1144ec1
7cc8bf4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
42 deletions
+0
-42
app/views/projects/project_members/_group_members.html.haml
app/views/projects/project_members/_group_members.html.haml
+0
-18
app/views/projects/project_members/_shared_group_members.html.haml
.../projects/project_members/_shared_group_members.html.haml
+0
-24
No files found.
app/views/projects/project_members/_group_members.html.haml
deleted
100644 → 0
View file @
c1144ec1
.panel.panel-default
.panel-heading
Group members with access to
%strong
=
@group
.
name
%span
.badge
=
members
.
size
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
.controls
=
link_to
'Manage group members'
,
group_group_members_path
(
@group
),
class:
'btn'
%ul
.content-list
=
render
partial:
'shared/members/member'
,
collection:
members
.
limit
(
20
),
as: :member
,
locals:
{
show_controls:
false
}
-
if
members
.
size
>
20
%li
and
#{
members
.
count
-
20
}
more. For full list visit
#{
link_to
'group members page'
,
group_group_members_path
(
@group
)
}
app/views/projects/project_members/_shared_group_members.html.haml
deleted
100644 → 0
View file @
c1144ec1
-
@project_group_links
.
each
do
|
group_links
|
-
shared_group
=
group_links
.
group
-
shared_group_members
=
shared_group
.
members
-
shared_group_users_count
=
shared_group_members
.
size
.panel.panel-default
.panel-heading
Shared with
%strong
=
shared_group
.
name
group, members with
%strong
=
group_links
.
human_access
role (
#{
shared_group_users_count
}
)
-
if
can?
(
current_user
,
:admin_group
,
shared_group
)
.panel-head-actions
=
link_to
group_group_members_path
(
shared_group
),
class:
'btn btn-sm'
do
%i
.fa.fa-pencil-square-o
Edit group members
%ul
.content-list
=
render
partial:
'shared/members/member'
,
collection:
shared_group_members
.
order
(
access_level: :desc
).
limit
(
20
),
as: :member
,
locals:
{
show_controls:
false
,
show_roles:
false
}
-
if
shared_group_users_count
>
20
%li
and
#{
shared_group_users_count
-
20
}
more. For full list visit
#{
link_to
'group members page'
,
group_group_members_path
(
shared_group
)
}
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