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
48b3ad6d
Commit
48b3ad6d
authored
Dec 15, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Banzai::XFilter -> Banzai::Filter::XFilter
parent
7781bda9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+1
-1
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+1
-1
app/models/note.rb
app/models/note.rb
+2
-2
No files found.
app/helpers/issues_helper.rb
View file @
48b3ad6d
...
@@ -121,6 +121,6 @@ module IssuesHelper
...
@@ -121,6 +121,6 @@ module IssuesHelper
end
end
end
end
# Required for Banzai::IssueReferenceFilter
# Required for Banzai::
Filter::
IssueReferenceFilter
module_function
:url_for_issue
module_function
:url_for_issue
end
end
app/helpers/labels_helper.rb
View file @
48b3ad6d
...
@@ -107,6 +107,6 @@ module LabelsHelper
...
@@ -107,6 +107,6 @@ module LabelsHelper
options_from_collection_for_select
(
grouped_labels
,
'name'
,
'title'
,
params
[
:label_name
])
options_from_collection_for_select
(
grouped_labels
,
'name'
,
'title'
,
params
[
:label_name
])
end
end
# Required for Banzai::LabelReferenceFilter
# Required for Banzai::
Filter::
LabelReferenceFilter
module_function
:render_colored_label
,
:text_color_for_bg
,
:escape_once
module_function
:render_colored_label
,
:text_color_for_bg
,
:escape_once
end
end
app/models/note.rb
View file @
48b3ad6d
...
@@ -373,11 +373,11 @@ class Note < ActiveRecord::Base
...
@@ -373,11 +373,11 @@ class Note < ActiveRecord::Base
end
end
def
contains_emoji_only?
def
contains_emoji_only?
note
=~
/\A
#{
Banzai
::
EmojiFilter
.
emoji_pattern
}
\s?\Z/
note
=~
/\A
#{
Banzai
::
Filter
::
EmojiFilter
.
emoji_pattern
}
\s?\Z/
end
end
def
award_emoji_name
def
award_emoji_name
original_name
=
note
.
match
(
Banzai
::
EmojiFilter
.
emoji_pattern
)[
1
]
original_name
=
note
.
match
(
Banzai
::
Filter
::
EmojiFilter
.
emoji_pattern
)[
1
]
AwardEmoji
.
normilize_emoji_name
(
original_name
)
AwardEmoji
.
normilize_emoji_name
(
original_name
)
end
end
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