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
640d51f4
Commit
640d51f4
authored
11 years ago
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GFM in events
Fixes #2563
parent
592d626d
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/views/events/event/_common.html.haml
app/views/events/event/_common.html.haml
+2
-3
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+1
-1
No files found.
app/views/events/event/_common.html.haml
View file @
640d51f4
...
...
@@ -2,10 +2,9 @@
%span
.author_name
=
link_to_author
event
%span
.event_label
{
class:
event
.
action_name
}=
event_action_name
(
event
)
-
if
event
.
target
=
link_to
[
event
.
project
,
event
.
target
]
do
%strong
=
truncate
event
.
target_title
%strong
=
link_to_gfm
truncate
(
event
.
target_title
),
[
event
.
project
,
event
.
target
]
-
else
%strong
=
truncate
event
.
target_title
%strong
=
gfm
truncate
(
event
.
target_title
)
at
-
if
event
.
project
=
link_to_project
event
.
project
...
...
This diff is collapsed.
Click to expand it.
app/views/events/event/_note.html.haml
View file @
640d51f4
...
...
@@ -21,4 +21,4 @@
.event-body
%span
.event-note
%i
.icon-comment-alt
=
truncate
event
.
target
.
note
,
length:
70
=
gfm
truncate
(
event
.
target
.
note
,
length:
70
)
This diff is collapsed.
Click to expand it.
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