Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
dc7edf0c0afe
Commit
c307fd22
authored
Jan 08, 2014
by
Dmitriy Zaporozhets
Browse files
Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq
parents
e438a58cfb5f
f0e09445adc5
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/helpers/application_helper.rb
View file @
dc7edf0c
...
...
@@ -217,4 +217,8 @@ def time_ago_with_tooltip(date, placement = 'top', html_class = 'time_ago')
haml_tag
:script
,
"$('."
+
html_class
+
"').timeago().tooltip()"
end
.
html_safe
end
def
render_markup
(
file_name
,
file_content
)
GitHub
::
Markup
.
render
(
file_name
,
file_content
).
html_safe
end
end
app/views/projects/blob/_text.html.haml
View file @
dc7edf0c
...
...
@@ -4,7 +4,7 @@
=
markdown
(
blob
.
data
)
-
elsif
markup?
(
blob
.
name
)
.file-content.wiki
=
r
aw
GitHub
::
Markup
.
render
(
blob
.
name
,
blob
.
data
)
=
r
ender_markup
(
blob
.
name
,
blob
.
data
)
-
else
.file-content.code
-
unless
blob
.
empty?
...
...
app/views/projects/tree/_readme.html.haml
View file @
dc7edf0c
...
...
@@ -9,5 +9,5 @@
-
elsif
plain_text_readme?
(
readme
.
name
)
%pre
.clean
=
readme
.
data
-
els
e
=
r
aw
GitHub
::
Markup
.
render
(
readme
.
name
,
readme
.
data
)
-
els
if
markup?
(
readme
.
name
)
=
r
ender_markup
(
readme
.
name
,
readme
.
data
)
app/views/snippets/_blob.html.haml
View file @
dc7edf0c
...
...
@@ -15,7 +15,7 @@
=
markdown
(
@snippet
.
data
)
-
elsif
markup?
(
@snippet
.
file_name
)
.file-content.wiki
=
r
aw
GitHub
::
Markup
.
render
(
@snippet
.
file_name
,
@snippet
.
data
)
=
r
ender_markup
(
@snippet
.
file_name
,
@snippet
.
data
)
-
else
.file-content.code
%div
{
class:
user_color_scheme_class
}
...
...
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