summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-06 15:31:08 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-06 15:31:08 -0400
commitd5ee54df163e0b2e613701ba107d6163be656930 (patch)
treec2f7bc07474d7972fb7330895ed7ba6a605531c8 /app
parent33836ae02c160657c4320e41916f8162ebfab635 (diff)
downloadgitlab-ce-d5ee54df163e0b2e613701ba107d6163be656930.tar.gz
More JS dependency requirements
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/application.js.coffee1
-rw-r--r--app/assets/javascripts/issue.js.coffee2
-rw-r--r--app/assets/javascripts/merge_request.js.coffee4
-rw-r--r--app/assets/javascripts/notes.js.coffee1
4 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 3b8eaa143e2..bb9da147018 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -41,7 +41,6 @@
#= require shortcuts_issuable
#= require shortcuts_network
#= require cal-heatmap
-#= require task_list
#= require_tree .
window.slugify = (text) ->
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index ab2435e28b8..86ad3d03bac 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -1,4 +1,6 @@
+#= require jquery
#= require jquery.waitforimages
+#= require task_list
class @Issue
constructor: ->
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index c8affba5b29..7c1e2b822d7 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -1,3 +1,7 @@
+#= require jquery
+#= require bootstrap
+#= require task_list
+
class @MergeRequest
constructor: (@opts) ->
@initContextWidget()
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 72e7492abc9..c25b1ddb066 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -1,3 +1,4 @@
+#= require jquery
#= require autosave
#= require bootstrap
#= require dropzone