Fix github issue #967

Dmitriy Zaporozhets
1 parent 0530e5ba
Showing 1 changed file with 7 additions and 4 deletions Show diff stats
app/views/protected_branches/index.html.haml
@@ -39,10 +39,13 @@
               - if branch.name == @project.root_ref
                 %span.label default
           %td
-            = link_to project_commit_path(@project, branch.commit.id) do
-              = truncate branch.commit.id.to_s, length: 10
-            = time_ago_in_words(branch.commit.committed_date)
-            ago
+            - if branch.commit
+              = link_to project_commit_path(@project, branch.commit.id) do
+                = truncate branch.commit.id.to_s, length: 10
+              = time_ago_in_words(branch.commit.committed_date)
+              ago
+            - else
+              (branch was removed from repository)
           %td
             - if can? current_user, :admin_project, @project
               = link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "danger btn small"
...	...	@@ -39,10 +39,13 @@
39	39	- if branch.name == @project.root_ref
40	40	%span.label default
41	41	%td
42		- = link_to project_commit_path(@project, branch.commit.id) do
43		- = truncate branch.commit.id.to_s, length: 10
44		- = time_ago_in_words(branch.commit.committed_date)
45		- ago
	42	+ - if branch.commit
	43	+ = link_to project_commit_path(@project, branch.commit.id) do
	44	+ = truncate branch.commit.id.to_s, length: 10
	45	+ = time_ago_in_words(branch.commit.committed_date)
	46	+ ago
	47	+ - else
	48	+ (branch was removed from repository)
46	49	%td
47	50	- if can? current_user, :admin_project, @project
48	51	= link_to 'Unprotect', [@project, branch], confirm: 'Are you sure?', method: :delete, class: "danger btn small"
...	...