diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-01-18 15:49:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-01-18 15:49:22 +0000 |
| commit | f208897ccbdb539eb16a72d32cce68881eaffca7 (patch) | |
| tree | 1b731e73ac9bc08757c29f1fc157617221eb612c /config | |
| parent | 5e9196b3bcc31ce7fd698ed49af5d39eae1da630 (diff) | |
| parent | 63b36241945a7f9bb280f360b3b269de8c5be8f6 (diff) | |
| download | gitlab-ce-f208897ccbdb539eb16a72d32cce68881eaffca7.tar.gz | |
Merge branch 'backport-time-tracking-ce' into 'master'
Backport timetracking to CE
See merge request !8195
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 |
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" |