summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/lib/ace.js
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-22 11:34:41 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-22 11:34:41 +0300
commit9329436deb3931d28c28b41de56173ef8acd63b5 (patch)
tree7557875233d3b506c2496599db1814afc7558c7c /app/assets/javascripts/lib/ace.js
parent6db65143db5003f74ddb1c9868a3d852e5661a0a (diff)
parentfb84439a92e759ff90811e98f6abf6bdbb3e6d55 (diff)
downloadgitlab-ce-9329436deb3931d28c28b41de56173ef8acd63b5.tar.gz
Merge branch 'master' into dz-merge-request-version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/javascripts/lib/ace.js')
-rw-r--r--app/assets/javascripts/lib/ace.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/lib/ace.js b/app/assets/javascripts/lib/ace.js
new file mode 100644
index 00000000000..4cdf99cae72
--- /dev/null
+++ b/app/assets/javascripts/lib/ace.js
@@ -0,0 +1,2 @@
+/*= require ace-rails-ap */
+/*= require ace/ext-searchbox */