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
4b3fa67c
Commit
4b3fa67c
authored
Aug 02, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ldap_cn field to Group
parent
2c8ee981
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
1 deletion
+25
-1
app/models/group.rb
app/models/group.rb
+2
-0
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+16
-0
db/migrate/20130802124933_add_ldap_settings_to_group.rb
db/migrate/20130802124933_add_ldap_settings_to_group.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-1
No files found.
app/models/group.rb
View file @
4b3fa67c
...
@@ -19,6 +19,8 @@ class Group < Namespace
...
@@ -19,6 +19,8 @@ class Group < Namespace
has_many
:project_group_links
,
dependent: :destroy
has_many
:project_group_links
,
dependent: :destroy
has_many
:shared_projects
,
through: :project_group_links
,
source:
'project'
has_many
:shared_projects
,
through: :project_group_links
,
source:
'project'
attr_accessible
:ldap_cn
after_create
:add_owner
after_create
:add_owner
def
human_name
def
human_name
...
...
app/views/groups/edit.html.haml
View file @
4b3fa67c
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
=
link_to
'#tab-projects'
,
'data-toggle'
=>
'tab'
do
=
link_to
'#tab-projects'
,
'data-toggle'
=>
'tab'
do
%i
.icon-folder-close
%i
.icon-folder-close
Projects
Projects
%li
=
link_to
'LDAP'
,
'#tab-ldap'
,
'data-toggle'
=>
'tab'
%li
%li
=
link_to
'Transfer'
,
'#tab-transfer'
,
'data-toggle'
=>
'tab'
=
link_to
'Transfer'
,
'#tab-transfer'
,
'data-toggle'
=>
'tab'
%li
%li
...
@@ -65,6 +67,20 @@
...
@@ -65,6 +67,20 @@
-
if
@group
.
projects
.
blank?
-
if
@group
.
projects
.
blank?
%p
.nothing_here_message
This group has no projects yet
%p
.nothing_here_message
This group has no projects yet
.tab-pane
#tab-ldap
.ui-box
.title
LDAP group settings
%div
.form-holder
=
form_for
@group
do
|
f
|
.clearfix
=
f
.
label
:ldap_cn
do
LDAP Group cn
.input
=
f
.
text_field
:ldap_cn
,
placeholder:
"Ex. QA group"
,
class:
"xxlarge left"
.form-actions
=
f
.
submit
'Save group'
,
class:
"btn btn-save"
.tab-pane
#tab-transfer
.tab-pane
#tab-transfer
.ui-box.ui-box-danger
.ui-box.ui-box-danger
.title
Transfer group
.title
Transfer group
...
...
db/migrate/20130802124933_add_ldap_settings_to_group.rb
0 → 100644
View file @
4b3fa67c
class
AddLdapSettingsToGroup
<
ActiveRecord
::
Migration
def
change
add_column
:namespaces
,
:ldap_cn
,
:string
,
null:
true
end
end
db/schema.rb
View file @
4b3fa67c
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended to check this file into your version control system.
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
20130
711063759
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
20130
802124933
)
do
create_table
"deploy_keys_projects"
,
:force
=>
true
do
|
t
|
create_table
"deploy_keys_projects"
,
:force
=>
true
do
|
t
|
t
.
integer
"deploy_key_id"
,
:null
=>
false
t
.
integer
"deploy_key_id"
,
:null
=>
false
...
@@ -129,6 +129,7 @@ ActiveRecord::Schema.define(:version => 20130711063759) do
...
@@ -129,6 +129,7 @@ ActiveRecord::Schema.define(:version => 20130711063759) do
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
string
"type"
t
.
string
"type"
t
.
string
"description"
,
:default
=>
""
,
:null
=>
false
t
.
string
"description"
,
:default
=>
""
,
:null
=>
false
t
.
string
"ldap_cn"
end
end
add_index
"namespaces"
,
[
"name"
],
:name
=>
"index_namespaces_on_name"
add_index
"namespaces"
,
[
"name"
],
:name
=>
"index_namespaces_on_name"
...
...
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