BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fe13f58f
Commit
fe13f58f
authored
Feb 12, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Emoji asset path
Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
parent
f9bf87bb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
application.rb
config/application.rb
+2
-2
emoji_filter.rb
lib/banzai/filter/emoji_filter.rb
+2
-1
No files found.
app/controllers/projects_controller.rb
View file @
fe13f58f
...
...
@@ -236,7 +236,7 @@ class ProjectsController < ApplicationController
Emoji
.
emojis
.
map
do
|
name
,
emoji
|
{
name:
name
,
path:
view_context
.
image_url
(
"
emoji/
#{
emoji
[
"unicode"
]
}
.png"
)
path:
view_context
.
image_url
(
"
#{
emoji
[
"unicode"
]
}
.png"
)
}
end
end
...
...
config/application.rb
View file @
fe13f58f
...
...
@@ -43,8 +43,8 @@ module Gitlab
# Enable the asset pipeline
config
.
assets
.
enabled
=
true
config
.
assets
.
paths
<<
Emoji
.
images_path
config
.
assets
.
precompile
<<
"
emoji/
*.png"
config
.
assets
.
paths
<<
Gemojione
.
index
.
images_path
config
.
assets
.
precompile
<<
"*.png"
config
.
assets
.
precompile
<<
"print.css"
# Version of your assets, change this if you want to expire all your assets
...
...
lib/banzai/filter/emoji_filter.rb
View file @
fe13f58f
...
...
@@ -45,7 +45,8 @@ module Banzai
private
def
emoji_url
(
name
)
emoji_path
=
"emoji/
#{
emoji_filename
(
name
)
}
"
emoji_path
=
emoji_filename
(
name
)
if
context
[
:asset_host
]
# Asset host is specified.
url_to_image
(
emoji_path
)
...
...
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