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
Boxiang Sun
gitlab-ce
Commits
1d14676e
Commit
1d14676e
authored
Oct 10, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Substitute right single quote back with apostrophe.
parent
a9123083
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
lib/redcarpet/render/gitlab_html.rb
lib/redcarpet/render/gitlab_html.rb
+1
-0
spec/helpers/gitlab_markdown_helper_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
+2
-2
No files found.
lib/redcarpet/render/gitlab_html.rb
View file @
1d14676e
...
@@ -49,6 +49,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
...
@@ -49,6 +49,7 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
end
end
def
postprocess
(
full_document
)
def
postprocess
(
full_document
)
full_document
.
gsub!
(
"’"
,
"'"
)
unless
@template
.
instance_variable_get
(
"@project_wiki"
)
||
@project
.
nil?
unless
@template
.
instance_variable_get
(
"@project_wiki"
)
||
@project
.
nil?
full_document
=
h
.
create_relative_links
(
full_document
)
full_document
=
h
.
create_relative_links
(
full_document
)
end
end
...
...
spec/helpers/gitlab_markdown_helper_spec.rb
View file @
1d14676e
...
@@ -535,7 +535,7 @@ describe GitlabMarkdownHelper do
...
@@ -535,7 +535,7 @@ describe GitlabMarkdownHelper do
project
.
issues
.
stub
(
:where
).
with
(
iid:
'39'
).
and_return
([
issue
])
project
.
issues
.
stub
(
:where
).
with
(
iid:
'39'
).
and_return
([
issue
])
actual
=
"Yes, it is @
#{
member
.
user
.
username
}
's task."
actual
=
"Yes, it is @
#{
member
.
user
.
username
}
's task."
expected
=
/Yes, it is <a.+>@
#{
member
.
user
.
username
}
<\/a>
’
s task/
expected
=
/Yes, it is <a.+>@
#{
member
.
user
.
username
}
<\/a>
'
s task/
markdown
(
actual
).
should
match
(
expected
)
markdown
(
actual
).
should
match
(
expected
)
end
end
...
@@ -574,7 +574,7 @@ describe GitlabMarkdownHelper do
...
@@ -574,7 +574,7 @@ describe GitlabMarkdownHelper do
it
"should leave inline code untouched"
do
it
"should leave inline code untouched"
do
markdown
(
"
\n
Don't use `$
#{
snippet
.
id
}
` here.
\n
"
).
should
==
markdown
(
"
\n
Don't use `$
#{
snippet
.
id
}
` here.
\n
"
).
should
==
"<p>Don
’
t use <code>$
#{
snippet
.
id
}
</code> here.</p>
\n
"
"<p>Don
'
t use <code>$
#{
snippet
.
id
}
</code> here.</p>
\n
"
end
end
it
"should leave ref-like autolinks untouched"
do
it
"should leave ref-like autolinks untouched"
do
...
...
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