summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-09-28 05:12:13 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-10-13 14:16:35 -0500
commita8ac9089afb664e569b34c61dc6782d20d1019d1 (patch)
treebada4e3a7ef3a79831ea3faec559b02c674a5788 /config/application.rb
parente84f959ae47e35eaebdc6c0adaf1e089326601ce (diff)
downloadgitlab-ce-a8ac9089afb664e569b34c61dc6782d20d1019d1.tar.gz
Refactor JS code
- Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 962ffe0708d..8a9c539cb43 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -89,6 +89,7 @@ module Gitlab
config.assets.precompile << "profile/profile_bundle.js"
config.assets.precompile << "diff_notes/diff_notes_bundle.js"
config.assets.precompile << "boards/boards_bundle.js"
+ config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js"
config.assets.precompile << "boards/test_utils/simulate_drag.js"
config.assets.precompile << "blob_edit/blob_edit_bundle.js"
config.assets.precompile << "snippet/snippet_bundle.js"