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
ce910147
Commit
ce910147
authored
Oct 16, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix use of Emoji
parent
5d42d92c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
ce910147
...
@@ -115,7 +115,7 @@ module ApplicationHelper
...
@@ -115,7 +115,7 @@ module ApplicationHelper
def
emoji_autocomplete_source
def
emoji_autocomplete_source
# should be an array of strings
# should be an array of strings
# so to_s can be called, because it is sufficient and to_json is too slow
# so to_s can be called, because it is sufficient and to_json is too slow
Emoji
::
NAMES
.
to_s
Emoji
.
names
.
to_s
end
end
def
ldap_enable?
def
ldap_enable?
...
...
lib/gitlab/markdown.rb
View file @
ce910147
...
@@ -128,7 +128,7 @@ module Gitlab
...
@@ -128,7 +128,7 @@ module Gitlab
#
#
# Returns boolean
# Returns boolean
def
valid_emoji?
(
emoji
)
def
valid_emoji?
(
emoji
)
Emoji
::
NAMES
.
include?
emoji
Emoji
.
names
.
include?
emoji
end
end
# Private: Dispatches to a dedicated processing method based on reference
# Private: Dispatches to a dedicated processing method based on reference
...
...
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