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
b33e897f
Commit
b33e897f
authored
Aug 14, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add basic layout for multiple ldap groups (admin)
parent
234ae2e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+17
-1
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/views/admin/groups/_form.html.haml
View file @
b33e897f
...
@@ -52,8 +52,24 @@
...
@@ -52,8 +52,24 @@
%li
It will change web url for access group and group projects.
%li
It will change web url for access group and group projects.
%li
It will change the git path to repositories under this group.
%li
It will change the git path to repositories under this group.
%section
.ldap-group-links
%fieldset
%fieldset
%legend
LDAP group settings
%legend
Current LDAP links
-
if
@group
.
ldap_group_links
.
any?
%ul
.bordered-list
-
@group
.
ldap_group_links
.
each
do
|
ldap_group_link
|
%li
%h4
=
ldap_group_link
.
cn
%small
.light
==
as
#{
ldap_group_link
.
human_access
}
.pull-right
=
link_to
group_ldap_group_link_path
(
@group
,
ldap_group_link
),
method: :destroy
,
class:
'btn btn-danger btn-small'
do
=
fa_icon
(
'unlink'
,
text:
'unlink'
)
-
else
%p
No links yet
%fieldset
%legend
Add new ldap group link
%div
.form-holder
%div
.form-holder
.form-group.clearfix
.form-group.clearfix
=
f
.
label
:ldap_cn
,
class:
'control-label'
do
=
f
.
label
:ldap_cn
,
class:
'control-label'
do
...
...
config/routes.rb
View file @
b33e897f
...
@@ -166,7 +166,7 @@ Gitlab::Application.routes.draw do
...
@@ -166,7 +166,7 @@ Gitlab::Application.routes.draw do
end
end
resources
:users_groups
,
only:
[
:create
,
:update
,
:destroy
]
resources
:users_groups
,
only:
[
:create
,
:update
,
:destroy
]
resources
:ldap_group_links
,
only:
[
:create
,
:destroy
]
scope
module: :groups
do
scope
module: :groups
do
resource
:avatar
,
only:
[
:destroy
]
resource
:avatar
,
only:
[
:destroy
]
resources
:milestones
resources
:milestones
...
...
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