Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
22a7fcab
Commit
22a7fcab
authored
Aug 28, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7620 from zzet/patch-11
Add search in textarea
parents
da55f2d9
f9c7f414
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+1
-0
app/views/projects/edit_tree/show.html.haml
app/views/projects/edit_tree/show.html.haml
+1
-0
No files found.
app/assets/javascripts/application.js.coffee
View file @
22a7fcab
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
#= require branch-graph
#= require branch-graph
#= require highlight.pack
#= require highlight.pack
#= require ace/ace
#= require ace/ace
#= require ace/ext-searchbox
#= require d3
#= require d3
#= require underscore
#= require underscore
#= require nprogress
#= require nprogress
...
...
app/views/projects/edit_tree/show.html.haml
View file @
22a7fcab
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
:javascript
:javascript
ace
.
config
.
set
(
"
modePath
"
,
gon
.
relative_url_root
+
"
#{
Gitlab
::
Application
.
config
.
assets
.
prefix
}
/ace
"
)
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
ace_mode
=
"
#{
@blob
.
language
.
try
(
:ace_mode
)
}
"
;
var
editor
=
ace
.
edit
(
"
editor
"
);
var
editor
=
ace
.
edit
(
"
editor
"
);
editor
.
setValue
(
"
#{
escape_javascript
(
@blob
.
data
)
}
"
);
editor
.
setValue
(
"
#{
escape_javascript
(
@blob
.
data
)
}
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment