Merge branch '4666-proper-ee-assets-precompile-fix' into 'master'

Resolve "Asset was not declared to be precompiled in production, favicon-green.ico"

Closes #4666

See merge request gitlab-org/gitlab-ee!4212

config/application.rb

@@ -111,17 +111,11 @@ module Gitlab
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
     # Support legacy unicode file named img emojis, `1F939.png`
     config.assets.paths << Gemojione.images_path
-    config.assets.paths << "vendor/assets/fonts"
-
-    # EE specific paths.
-    config.assets.paths << "ee/app/assets/images"
-    config.assets.paths << "ee/app/assets/javascripts"
-    config.assets.paths << "ee/app/assets/stylesheets"
+    config.assets.paths << "#{config.root}/vendor/assets/fonts"
 
-    config.assets.precompile << "*.png"
-    config.assets.precompile << "*.ico"
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
     config.assets.precompile << "mailers/*.css"
@@ -130,10 +124,23 @@ module Gitlab
     config.assets.precompile << "xterm/xterm.css"
     config.assets.precompile << "performance_bar.css"
     config.assets.precompile << "lib/ace.js"
-    config.assets.precompile << "vendor/assets/fonts/*"
     config.assets.precompile << "test.css"
     config.assets.precompile << "locale/**/app.js"
 
+    ## EE-specific assets config START
+    %w[images javascripts stylesheets].each do |path|
+      config.assets.paths << "#{config.root}/ee/app/assets/#{path}"
+    end
+
+    # Compile non-JS/CSS assets in the ee/app/assets folder by default
+    # Mimic sprockets-rails default: https://github.com/rails/sprockets-rails/blob/v3.2.1/lib/sprockets/railtie.rb#L84-L87
+    LOOSE_EE_APP_ASSETS = lambda do |logical_path, filename|
+      filename.start_with?(config.root.join("ee/app/assets").to_s) &&
+        !['.js', '.css', ''].include?(File.extname(logical_path))
+    end
+    config.assets.precompile << LOOSE_EE_APP_ASSETS
+    ## EE-specific assets config END
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'