Merge pull request #1596 from riyad/fix-messages-for-deleted-things
Fix messages for deleted things on dashboard
This commit is contained in:
commit
26045d7a2c
|
@ -54,7 +54,7 @@ class Event < ActiveRecord::Base
|
||||||
if project
|
if project
|
||||||
project.name
|
project.name
|
||||||
else
|
else
|
||||||
"(deleted)"
|
"(deleted project)"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ module PushEvent
|
||||||
if new_ref?
|
if new_ref?
|
||||||
"pushed new"
|
"pushed new"
|
||||||
elsif rm_ref?
|
elsif rm_ref?
|
||||||
"removed #{ref_type}"
|
"deleted"
|
||||||
else
|
else
|
||||||
"pushed to"
|
"pushed to"
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
.event-title
|
.event-title
|
||||||
%span.author_name= link_to_author event
|
%span.author_name= link_to_author event
|
||||||
%span.event_label.pushed #{event.push_action_name} #{event.ref_type}
|
%span.event_label.pushed #{event.push_action_name} #{event.ref_type}
|
||||||
|
- if event.rm_ref?
|
||||||
|
%strong= event.ref_name
|
||||||
|
- else
|
||||||
= link_to project_commits_path(event.project, event.ref_name) do
|
= link_to project_commits_path(event.project, event.ref_name) do
|
||||||
%strong= event.ref_name
|
%strong= event.ref_name
|
||||||
at
|
at
|
||||||
|
|
Loading…
Reference in a new issue