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
b3bbf53e
Commit
b3bbf53e
authored
Sep 05, 2012
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set the size of emoji to be 20x20
Forgot they were so big!
parent
67a6a0b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+1
-1
spec/helpers/gitlab_markdown_helper_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
+6
-0
No files found.
lib/gitlab/markdown.rb
View file @
b3bbf53e
...
@@ -95,7 +95,7 @@ module Gitlab
...
@@ -95,7 +95,7 @@ module Gitlab
text
=
text
.
gsub
(
EMOJI_PATTERN
)
do
|
match
|
text
=
text
.
gsub
(
EMOJI_PATTERN
)
do
|
match
|
if
valid_emoji?
(
$2
)
if
valid_emoji?
(
$2
)
helper
.
image_tag
(
"
#{
$2
}
.png"
,
class:
'emoji'
,
title:
$1
,
alt:
$1
)
helper
.
image_tag
(
"
#{
$2
}
.png"
,
size:
"20x20"
,
class:
'emoji'
,
title:
$1
,
alt:
$1
)
else
else
match
match
end
end
...
...
spec/helpers/gitlab_markdown_helper_spec.rb
View file @
b3bbf53e
...
@@ -234,6 +234,12 @@ describe GitlabMarkdownHelper do
...
@@ -234,6 +234,12 @@ describe GitlabMarkdownHelper do
gfm
(
":+1:"
).
should
match
(
'class="emoji"'
)
gfm
(
":+1:"
).
should
match
(
'class="emoji"'
)
end
end
it
"sets height and width"
do
actual
=
gfm
(
":+1:"
)
actual
.
should
match
(
/width="20"/
)
actual
.
should
match
(
/height="20"/
)
end
it
"keeps whitespace intact"
do
it
"keeps whitespace intact"
do
gfm
(
"This deserves a :+1: big time."
).
should
match
(
/deserves a <img.+\/> big time/
)
gfm
(
"This deserves a :+1: big time."
).
should
match
(
/deserves a <img.+\/> big time/
)
end
end
...
...
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