summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorthea <ta.kupler@gmail.com>2016-09-23 16:08:53 +0200
committerthea <ta.kupler@gmail.com>2016-09-23 16:08:53 +0200
commite8bcd666441311f4e4285c07b63a91750d6815c5 (patch)
tree6426713b247d0ce686c221779e7acb6df3c99df3 /config
parent873ba38715bb0e08f39a1effd64a26e9d05af78b (diff)
parentd18ad52a8bd35c53b5dee5041527f313aa18015a (diff)
Merge branch 'marie' into develop
Diffstat (limited to 'config')
-rw-r--r--config/initializers/assets.rb1
-rw-r--r--config/initializers/customization.rb4
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
#