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
9acbba6f
Commit
9acbba6f
authored
May 29, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ee-specific content-lists
parent
221861ca
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
ee/app/views/admin/licenses/show.html.haml
ee/app/views/admin/licenses/show.html.haml
+2
-2
ee/app/views/groups/hooks/index.html.haml
ee/app/views/groups/hooks/index.html.haml
+1
-1
ee/app/views/ldap_group_links/_ldap_group_links.html.haml
ee/app/views/ldap_group_links/_ldap_group_links.html.haml
+1
-1
ee/app/views/projects/ee/_merge_request_approvals_settings.html.haml
...s/projects/ee/_merge_request_approvals_settings.html.haml
+1
-1
ee/app/views/shared/issuable/_approvals.html.haml
ee/app/views/shared/issuable/_approvals.html.haml
+1
-1
No files found.
app/views/admin/groups/show.html.haml
View file @
9acbba6f
...
...
@@ -65,7 +65,7 @@
-
if
Gitlab
::
Auth
::
LDAP
::
Config
.
group_sync_enabled?
&&
@group
.
ldap_synced?
.card
.card-header
Active synchronizations
%ul
.
well
-list
%ul
.
content
-list
-
@group
.
ldap_group_links
.
select
(
&
:active?
).
each
do
|
ldap_group_link
|
%li
%strong
=
ldap_group_link
.
cn
?
"Group:
#{
ldap_group_link
.
cn
}
"
:
"Filter:
#{
truncate
(
ldap_group_link
.
filter
,
length:
40
)
}
"
...
...
ee/app/views/admin/licenses/show.html.haml
View file @
9acbba6f
...
...
@@ -13,7 +13,7 @@
.card
.card-header
Licensed to
%ul
.
well
-list
%ul
.
content
-list
-
@license
.
licensee
.
each
do
|
label
,
value
|
%li
%span
.light
#{
label
}
:
...
...
@@ -22,7 +22,7 @@
.card.js-license-info-panel
.card-header
Details
%ul
.
well
-list
%ul
.
content
-list
%li
%span
.light
Plan:
%strong
=
@license
.
plan
.
capitalize
...
...
ee/app/views/groups/hooks/index.html.haml
View file @
9acbba6f
...
...
@@ -16,7 +16,7 @@
%h5
.prepend-top-default
Webhooks (
#{
@hooks
.
count
}
)
-
if
@hooks
.
any?
%ul
.
well
-list
%ul
.
content
-list
-
@hooks
.
each
do
|
hook
|
=
render
'project_hook'
,
hook:
hook
-
else
...
...
ee/app/views/ldap_group_links/_ldap_group_links.html.haml
View file @
9acbba6f
...
...
@@ -4,7 +4,7 @@
Active synchronizations (
#{
group
.
ldap_group_links
.
count
}
)
-
if
group
.
ldap_group_links
.
any?
%ul
.
well
-list
%ul
.
content
-list
=
render
collection:
group
.
ldap_group_links
,
partial:
'ldap_group_links/ldap_group_link'
,
locals:
{
group:
group
}
-
else
.card-body
...
...
ee/app/views/projects/ee/_merge_request_approvals_settings.html.haml
View file @
9acbba6f
...
...
@@ -33,7 +33,7 @@
-
unless
ids
.
include?
(
user
.
id
)
-
ids
<<
user
.
id
=
ids
.
count
%ul
.
well
-list.approver-list
%ul
.
content
-list.approver-list
.load-wrapper.hidden
=
icon
(
'spinner spin'
,
class:
'approver-list-loader'
)
-
project
.
approvers
.
each
do
|
approver
|
...
...
ee/app/views/shared/issuable/_approvals.html.haml
View file @
9acbba6f
...
...
@@ -26,7 +26,7 @@
.card.prepend-top-10
.card-header
Approvers
%ul
.
well
-list.approver-list
%ul
.
content
-list.approver-list
-
if
issuable
.
all_approvers_including_groups
.
empty?
%li
.no-approvers
There are no approvers
-
else
...
...
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