deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix github issue #967

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-03 13:22:28 +02:00
parent 0530e5baae
commit 2d076394aa
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/views/protected_branches/index.html.haml
View file

@ -39,10 +39,13 @@
- if branch.name == @project.root_ref - if branch.name == @project.root_ref
%span.label default %span.label default
%td %td
= link_to project_commit_path(@project, branch.commit.id) do - if branch.commit
= truncate branch.commit.id.to_s, length: 10 = link_to project_commit_path(@project, branch.commit.id) do
= time_ago_in_words(branch.commit.committed_date) = truncate branch.commit.id.to_s, length: 10
ago = time_ago_in_words(branch.commit.committed_date)
ago
- else
(branch was removed from repository)
%td %td
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
= link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "danger btn small" = link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "danger btn small"