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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
57001c23
Commit
57001c23
authored
Jan 30, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix protected branches page UI
parent
ef735e82
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
app/views/projects/protected_branches/index.html.haml
app/views/projects/protected_branches/index.html.haml
+7
-7
No files found.
app/views/projects/protected_branches/index.html.haml
View file @
57001c23
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.col-md-3
.col-md-3
=
render
"projects/branches/filter"
=
render
"projects/branches/filter"
.col-md-9
.col-md-9
.
alert.aler
t-info
.
bs-callout.bs-callou
t-info
%p
Protected branches designed to prevent push for all except
#{
link_to
"masters"
,
help_permissions_path
,
class:
"vlink"
}
.
%p
Protected branches designed to prevent push for all except
#{
link_to
"masters"
,
help_permissions_path
,
class:
"vlink"
}
.
%p
This ability allows:
%p
This ability allows:
%ul
%ul
...
@@ -12,18 +12,18 @@
...
@@ -12,18 +12,18 @@
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"underlined_link"
}
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"underlined_link"
}
-
if
can?
current_user
,
:admin_project
,
@project
-
if
can?
current_user
,
:admin_project
,
@project
=
form_for
[
@project
,
@protected_branch
]
do
|
f
|
=
form_for
[
@project
,
@protected_branch
]
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
-
if
@protected_branch
.
errors
.
any?
-
if
@protected_branch
.
errors
.
any?
.alert.alert-danger
.alert.alert-danger
%ul
%ul
-
@protected_branch
.
errors
.
full_messages
.
each
do
|
msg
|
-
@protected_branch
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.
entry.clearfix
.
form-group
=
f
.
label
:name
,
"Branch"
=
f
.
label
:name
,
"Branch"
,
class:
'control-label'
.col-
md-3
.col-
sm-10
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
include_blank:
"Select branch"
},
{
class:
"select2
span3
"
})
=
f
.
select
(
:name
,
@project
.
open_branches
.
map
{
|
br
|
[
br
.
name
,
br
.
name
]
}
,
{
include_blank:
"Select branch"
},
{
class:
"select2"
})
.form-actions
=
f
.
submit
'Protect'
,
class:
"btn-create btn"
=
f
.
submit
'Protect'
,
class:
"btn-create btn"
-
unless
@branches
.
empty?
-
unless
@branches
.
empty?
%h5
Already Protected:
%h5
Already Protected:
...
...
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