diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 16:49:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-28 16:49:42 +0300 |
| commit | 22a7fcab8cf24232ef0a230ff04e34551bbaa107 (patch) | |
| tree | 18eaac4ac1cb2ee617404671305a117fe66f070b | |
| parent | da55f2d9b0ea76cdaf85651570641df9c7bb915f (diff) | |
| parent | f9c7f414765f202f843f42e5e23f0d5e6da7d26a (diff) | |
| download | gitlab-ce-22a7fcab8cf24232ef0a230ff04e34551bbaa107.tar.gz | |
Merge pull request #7620 from zzet/patch-11
Add search in textarea
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 | ||||
| -rw-r--r-- | app/views/projects/edit_tree/show.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 606f6afdba3..6bc24cf7590 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -26,6 +26,7 @@ #= require branch-graph #= require highlight.pack #= require ace/ace +#= require ace/ext-searchbox #= require d3 #= require underscore #= require nprogress diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml index 05050e7df7c..62798b51d82 100644 --- a/app/views/projects/edit_tree/show.html.haml +++ b/app/views/projects/edit_tree/show.html.haml @@ -41,6 +41,7 @@ :javascript ace.config.set("modePath", gon.relative_url_root + "#{Gitlab::Application.config.assets.prefix}/ace") + ace.config.loadModule("ace/ext/searchbox"); var ace_mode = "#{@blob.language.try(:ace_mode)}"; var editor = ace.edit("editor"); editor.setValue("#{escape_javascript(@blob.data)}"); |