diff options
| author | Azul <azul@riseup.net> | 2016-09-26 09:55:37 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-09-26 09:55:37 +0200 |
| commit | 917cddbeb6e3adaf346a7c5784fa9e6d70462e03 (patch) | |
| tree | 7665d638e722be4b17bad33bdfb446c89966445d /config | |
| parent | 4a73c2ca2938ae748588d7ca72a785af99724c92 (diff) | |
| parent | 69b182b1bf811e1d09c734debf0f71f8412dd6b7 (diff) | |
Merge remote-tracking branch 'pr/239' into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/assets.rb | 1 | ||||
| -rw-r--r-- | config/initializers/customization.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..ccb32b6 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1 @@ +Rails.application.config.assets.precompile += %w( Avatar_Pic.png ) diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb index 9f537e9..6d9c741 100644 --- a/config/initializers/customization.rb +++ b/config/initializers/customization.rb @@ -1,10 +1,8 @@ -# # When deploying, common customizations can be dropped in config/customizations. This initializer makes this work. # APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization" customization_directory = APP_CONFIG["customization_directory"] -# # Set customization views as the first view path # # Rails.application.config.paths['app/views'].unshift "config/customization/views" @@ -21,8 +19,8 @@ customization_directory = APP_CONFIG["customization_directory"] # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise # this initializer will never get called in production mode when the assets are precompiled. # +Rails.application.config.assets.paths.unshift "#{customization_directory}/images" Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets" - # # Copy files to public # |