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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f96827c4
Commit
f96827c4
authored
Jun 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dashboard lost if comment on commit
parent
f82ec5b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+8
-0
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+1
-1
No files found.
app/helpers/events_helper.rb
View file @
f96827c4
...
@@ -83,4 +83,12 @@ module EventsHelper
...
@@ -83,4 +83,12 @@ module EventsHelper
render
"events/event_push"
,
event:
event
render
"events/event_push"
,
event:
event
end
end
end
end
def
event_note_target_path
(
event
)
if
event
.
note?
&&
event
.
note_commit?
project_commit_path
(
event
.
project
,
event
.
note_target
)
else
url_for
([
event
.
project
,
event
.
note_target
])
end
end
end
end
app/views/events/event/_note.html.haml
View file @
f96827c4
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
event
.
note_target_type
=
event
.
note_target_type
=
link_to
event
.
note_short_commit_id
,
project_commit_path
(
event
.
project
,
event
.
note_commit_id
),
class:
"commit_short_id"
=
link_to
event
.
note_short_commit_id
,
project_commit_path
(
event
.
project
,
event
.
note_commit_id
),
class:
"commit_short_id"
-
else
-
else
=
link_to
[
event
.
project
,
event
.
note_target
]
do
=
link_to
event_note_target_path
(
event
)
do
%strong
%strong
#{
event
.
note_target_type
}
##{truncate event.note_target_id}
#{
event
.
note_target_type
}
##{truncate event.note_target_id}
...
...
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