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
cadc1e6a
Commit
cadc1e6a
authored
Aug 15, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change naming of multi-LDAP to linked LDAP groups
parent
1c430a0b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
+6
-7
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+1
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-2
app/views/groups/_settings_nav.html.haml
app/views/groups/_settings_nav.html.haml
+1
-1
app/views/groups/ldap_group_links/index.html.haml
app/views/groups/ldap_group_links/index.html.haml
+1
-1
app/views/ldap_group_links/_ldap_group_links.html.haml
app/views/ldap_group_links/_ldap_group_links.html.haml
+2
-2
No files found.
app/views/admin/groups/_form.html.haml
View file @
cadc1e6a
...
...
@@ -57,6 +57,6 @@
=
link_to
'Cancel'
,
admin_group_path
(
@group
),
class:
"btn btn-cancel"
-
if
@group
.
persisted?
%h3
.page-title
L
DAP Synchronization
s
%h3
.page-title
L
inked LDAP group
s
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/ldap_group_links'
,
group:
@group
app/views/admin/groups/show.html.haml
View file @
cadc1e6a
...
...
@@ -32,8 +32,7 @@
=
@group
.
created_at
.
stamp
(
"March 1, 1999"
)
.panel.panel-default
.panel-heading
LDAP Synchronizations
.panel-heading
Linked LDAP groups
%ul
.well-list
-
if
@group
.
ldap_group_links
.
any?
-
@group
.
ldap_group_links
.
each
do
|
ldap_group_link
|
...
...
app/views/groups/_settings_nav.html.haml
View file @
cadc1e6a
...
...
@@ -10,5 +10,5 @@
=
nav_link
(
controller: :ldap_group_links
)
do
=
link_to
group_ldap_group_links_path
(
@group
)
do
%i
.icon-exchange
LDAP
Sync
LDAP
Groups
app/views/groups/ldap_group_links/index.html.haml
View file @
cadc1e6a
.row
.col-md-2
=
render
'groups/settings_nav'
.col-md-10
%h3
.page-title
L
DAP Synchronization
s
%h3
.page-title
L
inked LDAP group
s
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/ldap_group_links'
,
group:
@group
app/views/ldap_group_links/_ldap_group_links.html.haml
View file @
cadc1e6a
.panel.panel-default
.panel-heading
%h4
.panel-title
L
DAP Synchronization
s
L
inked LDAP group
s
==
(
#{
group
.
ldap_group_links
.
count
}
)
-
if
group
.
ldap_group_links
.
any?
%ul
.well-list
=
render
collection:
group
.
ldap_group_links
,
partial:
'ldap_group_links/ldap_group_link'
,
locals:
{
group:
group
}
-
else
%p
No
synchronizations yet
%p
No
linked LDAP groups
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