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
427a9e16
Commit
427a9e16
authored
Jan 27, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EE ui fixes after twbs3
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1f359ece
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+6
-6
app/views/projects/group_links/index.html.haml
app/views/projects/group_links/index.html.haml
+9
-7
No files found.
app/views/groups/edit.html.haml
View file @
427a9e16
...
...
@@ -67,20 +67,20 @@
.title
LDAP group settings
%div
.form-holder
=
form_for
@group
do
|
f
|
.
control-group
=
f
.
label
:ldap_cn
do
.
form-group.clearfix
=
f
.
label
:ldap_cn
,
class:
'control-label'
do
LDAP Group cn
.co
ntrols
.co
l-sm-10
=
f
.
hidden_field
:ldap_cn
,
placeholder:
"Ex. QA group"
,
class:
"xxlarge ajax-ldap-groups-select"
.help-block
Synchronize
#{
@group
.
name
}
's members with this LDAP group.
%br
If you select an LDAP group you do not belong to you will lose ownership of
#{
@group
.
name
}
.
.
control-group
=
f
.
label
:ldap_access
do
.
form-group.clearfix
=
f
.
label
:ldap_access
,
class:
'control-label'
do
LDAP Access
.co
ntrols
.co
l-sm-10
=
f
.
select
:ldap_access
,
options_for_select
(
UsersGroup
.
group_access_roles
,
@group
.
ldap_access
)
.help-block
Default, minimum permission level for LDAP group members of
#{
@group
.
name
}
.
...
...
app/views/projects/group_links/index.html.haml
View file @
427a9e16
...
...
@@ -25,13 +25,15 @@
%h4
Can be shared with
%div
=
form_tag
project_group_links_path
(
@project
),
method: :post
do
.control-group
=
label_tag
:group_id
,
'Group'
.controls
=
select_tag
:group_id
,
options_from_collection_for_select
(
@available_groups
,
:id
,
:name
),
class:
'chosen'
.control-group
=
label_tag
:group_access
,
'Max access level'
.controls
=
select_tag
:group_access
,
options_for_select
(
ProjectGroupLink
.
access_options
,
ProjectGroupLink
.
default_access
),
class:
"span2"
=
form_tag
project_group_links_path
(
@project
),
method: :post
,
class:
'form-horizontal'
do
.form-group
=
label_tag
:group_id
,
'Group'
,
class:
'control-label'
.col-sm-10
=
select_tag
:group_id
,
options_from_collection_for_select
(
@available_groups
,
:id
,
:name
),
class:
'select2'
.form-group
=
label_tag
:group_access
,
'Max access level'
,
class:
'control-label'
.col-sm-10
=
select_tag
:group_access
,
options_for_select
(
ProjectGroupLink
.
access_options
,
ProjectGroupLink
.
default_access
),
class:
"form-control"
.form-actions
=
submit_tag
"Share"
,
class:
"btn btn-create"
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