diff options
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 1e9ec74cdbf..b905f1a3e90 100644 --- a/config/application.rb +++ b/config/application.rb @@ -6,6 +6,8 @@ I18n.config.enforce_available_locales = false Bundler.require(:default, Rails.env) module Gitlab + REDIS_CACHE_NAMESPACE = 'cache:gitlab' + class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -43,8 +45,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 @@ -89,7 +91,7 @@ module Gitlab redis_config_hash[:path] = redis_uri.path end - redis_config_hash[:namespace] = 'cache:gitlab' + redis_config_hash[:namespace] = REDIS_CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever config.cache_store = :redis_store, redis_config_hash |