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
8c0ff87f
Commit
8c0ff87f
authored
Sep 04, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into feaure-ldap-oauth-tests
parents
41f46bfa
746643e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
app/controllers/groups/ldap_group_links_controller.rb
app/controllers/groups/ldap_group_links_controller.rb
+7
-1
app/views/ldap_group_links/_ldap_group_links.html.haml
app/views/ldap_group_links/_ldap_group_links.html.haml
+2
-1
No files found.
app/controllers/groups/ldap_group_links_controller.rb
View file @
8c0ff87f
...
...
@@ -2,13 +2,19 @@ class Groups::LdapGroupLinksController < ApplicationController
before_action
:group
before_action
:authorize_admin_group!
layout
'group'
def
index
end
def
create
ldap_group_link
=
@group
.
ldap_group_links
.
build
(
ldap_group_link_params
)
if
ldap_group_link
.
save
redirect_to
:back
,
notice:
'New LDAP link saved'
if
request
.
referer
&&
request
.
referer
.
include?
(
'admin'
)
redirect_to
[
:admin
,
@group
],
notice:
'New LDAP link saved'
else
redirect_to
:back
,
notice:
'New LDAP link saved'
end
else
redirect_to
:back
,
alert:
'Could not create new LDAP link'
end
...
...
app/views/ldap_group_links/_ldap_group_links.html.haml
View file @
8c0ff87f
...
...
@@ -8,4 +8,5 @@
%ul
.well-list
=
render
collection:
group
.
ldap_group_links
,
partial:
'ldap_group_links/ldap_group_link'
,
locals:
{
group:
group
}
-
else
%p
No linked LDAP groups
.panel-body
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