summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2016-12-20 15:44:24 +0100
committerRuben Davila <rdavila84@gmail.com>2017-01-15 11:10:04 -0500
commit64dd41a0e21360c380cab394f8a5c9b4945b7fd1 (patch)
treedc0cde8263d60786fbe05338790ccd186070f8fd /config
parentf1bd9f05e2ca0c165f06c47c32d44f2951265e6e (diff)
downloadgitlab-ce-64dd41a0e21360c380cab394f8a5c9b4945b7fd1.tar.gz
Backport timetracking frontend to CE.
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 8ce549cebf6..f00e58a36ca 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -88,6 +88,7 @@ module Gitlab
config.assets.precompile << "print.css"
config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css"
+ config.assets.precompile << "lib/vue_resource.js"
config.assets.precompile << "katex.css"
config.assets.precompile << "katex.js"
config.assets.precompile << "xterm/xterm.css"
@@ -98,6 +99,7 @@ module Gitlab
config.assets.precompile << "protected_branches/protected_branches_bundle.js"
config.assets.precompile << "diff_notes/diff_notes_bundle.js"
config.assets.precompile << "merge_request_widget/ci_bundle.js"
+ config.assets.precompile << "issuable/issuable_bundle.js"
config.assets.precompile << "boards/boards_bundle.js"
config.assets.precompile << "cycle_analytics/cycle_analytics_bundle.js"
config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js"