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
da9d8279
Commit
da9d8279
authored
Dec 29, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'inline-protected-branches' into 'master'
Improve UI for protected branches See merge request !1361
parents
95cd5b27
95c03937
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
13 deletions
+11
-13
app/views/projects/protected_branches/_branches_list.html.haml
...iews/projects/protected_branches/_branches_list.html.haml
+11
-13
No files found.
app/views/projects/protected_branches/_branches_list.html.haml
View file @
da9d8279
-
unless
@branches
.
empty?
%h5
Already Protected:
%br
%h4
Already Protected:
%table
.table.protected-branches-list
%thead
%tr
.no-border
%th
Branch
%th
Developers can push
%th
Last commit
%th
%tbody
...
...
@@ -18,19 +20,15 @@
%span
.label.label-info
default
%td
=
check_box_tag
"developers_can_push"
,
branch
.
id
,
branch
.
developers_can_push
,
"data-url"
=>
@url
%td
-
if
commit
=
branch
.
commit
=
link_to
project_commit_path
(
@project
,
commit
.
id
),
class:
'commit_short_id'
do
=
commit
.
short_id
·
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
-
else
(branch was removed from repository)
%td
.pull-right
-
if
can?
current_user
,
:admin_project
,
@project
=
link_to
'Unprotect'
,
[
@project
,
branch
],
data:
{
confirm:
'Branch will be writable for developers. Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-small"
%tr
.no-border
%td
-
if
commit
=
branch
.
commit
=
link_to
project_commit_path
(
@project
,
commit
.
id
),
class:
'commit_short_id'
do
=
commit
.
short_id
%span
.light
=
gfm
escape_once
(
truncate
(
commit
.
title
,
length:
40
))
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
-
else
(branch was removed from repository)
%td
%td
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