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
b6d3eadf
Commit
b6d3eadf
authored
Jul 19, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix method visiblity in emoji filter class
parent
3d2b6a3d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
lib/banzai/filter/emoji_filter.rb
lib/banzai/filter/emoji_filter.rb
+5
-5
No files found.
lib/banzai/filter/emoji_filter.rb
View file @
b6d3eadf
...
@@ -38,6 +38,11 @@ module Banzai
...
@@ -38,6 +38,11 @@ module Banzai
end
end
end
end
# Build a regexp that matches all valid :emoji: names.
def
self
.
emoji_pattern
@emoji_pattern
||=
/:(
#{
Gitlab
::
Emoji
.
emojis_names
.
map
{
|
name
|
Regexp
.
escape
(
name
)
}
.join('|')}):/
end
private
private
def
emoji_url
(
name
)
def
emoji_url
(
name
)
...
@@ -59,11 +64,6 @@ module Banzai
...
@@ -59,11 +64,6 @@ module Banzai
ActionController
::
Base
.
helpers
.
url_to_image
(
image
)
ActionController
::
Base
.
helpers
.
url_to_image
(
image
)
end
end
# Build a regexp that matches all valid :emoji: names.
def
self
.
emoji_pattern
@emoji_pattern
||=
/:(
#{
Gitlab
::
Emoji
.
emojis_names
.
map
{
|
name
|
Regexp
.
escape
(
name
)
}
.join('|')}):/
end
def
emoji_pattern
def
emoji_pattern
self
.
class
.
emoji_pattern
self
.
class
.
emoji_pattern
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