diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-03 09:54:12 +0200 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-03 09:54:12 +0200 |
| commit | d39b3d4b8d2d4c5ded46182a5353c68a8f5bb5cd (patch) | |
| tree | e8f2fac760b252928ff23074dea9d1f209838a33 /config/application.rb | |
| parent | dcb67951a817db262ddcd3b777fafc4e1995fc04 (diff) | |
| parent | 2c9568edeea7d95b6e4ec3c23cdc1c027bf86d5f (diff) | |
| download | gitlab-ce-d39b3d4b8d2d4c5ded46182a5353c68a8f5bb5cd.tar.gz | |
Merge branch 'master' into feature/runner-per-group
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index ad7338763f7..09f706e3d70 100644 --- a/config/application.rb +++ b/config/application.rb @@ -115,6 +115,7 @@ module Gitlab config.assets.precompile << "test.css" config.assets.precompile << "snippets.css" config.assets.precompile << "locale/**/app.js" + config.assets.precompile << "emoji_sprites.css" # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab-org/gitlab-svgs/dist" |