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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
26045d7a
Commit
26045d7a
authored
Oct 08, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1596 from riyad/fix-messages-for-deleted-things
Fix messages for deleted things on dashboard
parents
a635b9da
93bc1ff1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
app/models/event.rb
app/models/event.rb
+1
-1
app/roles/push_event.rb
app/roles/push_event.rb
+1
-1
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+4
-1
No files found.
app/models/event.rb
View file @
26045d7a
...
...
@@ -54,7 +54,7 @@ class Event < ActiveRecord::Base
if
project
project
.
name
else
"(deleted)"
"(deleted
project
)"
end
end
...
...
app/roles/push_event.rb
View file @
26045d7a
...
...
@@ -70,7 +70,7 @@ module PushEvent
if
new_ref?
"pushed new"
elsif
rm_ref?
"
removed
#{
ref_type
}
"
"
deleted
"
else
"pushed to"
end
...
...
app/views/events/event/_push.html.haml
View file @
26045d7a
.event-title
%span
.author_name
=
link_to_author
event
%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
-
else
=
link_to
project_commits_path
(
event
.
project
,
event
.
ref_name
)
do
%strong
=
event
.
ref_name
at
%strong
=
link_to
event
.
project
.
name
,
event
.
project
...
...
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