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

Merge pull request #1596 from riyad/fix-messages-for-deleted-things

Browse source 
Fix messages for deleted things on dashboard
This commit is contained in:
Dmitriy Zaporozhets 2012-10-08 22:27:25 -07:00
parent a635b9da97 93bc1ff108
commit 26045d7a2c
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/event.rb
View file

@ -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

2
app/roles/push_event.rb
View file

@ -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

5
app/views/events/event/_push.html.haml
View file

@ -1,8 +1,11 @@
.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}
= link_to project_commits_path(event.project, event.ref_name) do - if event.rm_ref?
%strong= event.ref_name %strong= event.ref_name
- else
= link_to project_commits_path(event.project, event.ref_name) do
%strong= event.ref_name
at at
%strong= link_to event.project.name, event.project %strong= link_to event.project.name, event.project