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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d16a3cf7
Commit
d16a3cf7
authored
Jun 07, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix replacement of Pygments with Rouge
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
da3ad00c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
app/assets/javascripts/peek.js
app/assets/javascripts/peek.js
+6
-2
lib/peek/rblineprof/custom_controller_helpers.rb
lib/peek/rblineprof/custom_controller_helpers.rb
+1
-1
vendor/assets/javascripts/peek.rblineprof.js
vendor/assets/javascripts/peek.rblineprof.js
+0
-5
vendor/assets/stylesheets/peek.scss
vendor/assets/stylesheets/peek.scss
+0
-1
No files found.
app/assets/javascripts/peek.js
View file @
d16a3cf7
import
'
vendor/peek
'
;
import
'
vendor/peek
'
;
import
'
vendor/peek.performance_bar
'
;
import
'
vendor/peek.performance_bar
'
;
import
'
vendor/peek.rblineprof
'
;
(
function
()
{
(
function
()
{
$
(
document
).
on
(
'
click
'
,
'
#peek-show-queries
'
,
function
(
e
)
{
$
(
document
).
on
(
'
click
'
,
'
#peek-show-queries
'
,
function
(
e
)
{
console
.
log
(
'
peek!
'
);
var
$modal
;
var
$modal
;
$
(
'
.peek-rblineprof-modal
'
).
hide
();
$modal
=
$
(
'
#modal-peek-pg-queries
'
);
$modal
=
$
(
'
#modal-peek-pg-queries
'
);
if
(
$modal
.
length
)
{
if
(
$modal
.
length
)
{
$modal
.
modal
(
'
toggle
'
);
$modal
.
modal
(
'
toggle
'
);
}
}
return
e
.
preventDefault
();
return
e
.
preventDefault
();
});
});
$
(
document
).
on
(
'
click
'
,
'
.js-lineprof-file
'
,
function
(
e
)
{
$
(
this
).
parents
(
'
.heading
'
).
next
(
'
div
'
).
toggle
();
return
e
.
preventDefault
();
});
}).
call
(
window
);
}).
call
(
window
);
lib/peek/rblineprof/custom_controller_helpers.rb
View file @
d16a3cf7
...
@@ -77,7 +77,7 @@ module Peek
...
@@ -77,7 +77,7 @@ module Peek
output
<<
"<pre class='duration'>
#{
times
.
join
(
"
\n
"
)
}
</pre>"
output
<<
"<pre class='duration'>
#{
times
.
join
(
"
\n
"
)
}
</pre>"
# The following line was changed from
# The following line was changed from
# https://github.com/peek/peek-rblineprof/blob/8d3b7a283a27de2f40abda45974516693d882258/lib/peek/rblineprof/controller_helpers.rb#L125
# https://github.com/peek/peek-rblineprof/blob/8d3b7a283a27de2f40abda45974516693d882258/lib/peek/rblineprof/controller_helpers.rb#L125
output
<<
"<pre class='code highlight'>
#{
pygmentize
(
file_name
,
code
.
join
,
'ruby'
)
}
</pre>"
output
<<
"<pre class='code highlight
white
'>
#{
pygmentize
(
file_name
,
code
.
join
,
'ruby'
)
}
</pre>"
output
<<
"</div></div>"
# .data then .peek-rblineprof-file
output
<<
"</div></div>"
# .data then .peek-rblineprof-file
end
end
...
...
vendor/assets/javascripts/peek.rblineprof.js
deleted
100644 → 0
View file @
da3ad00c
$
(
document
).
on
(
'
click
'
,
'
.js-lineprof-file
'
,
function
(
e
)
{
$
(
this
).
parents
(
'
.heading
'
).
next
(
'
div
'
).
toggle
();
e
.
preventDefault
();
return
false
;
});
vendor/assets/stylesheets/peek.scss
View file @
d16a3cf7
//= require peek/views/performance_bar
//= require peek/views/performance_bar
//= require peek/views/rblineprof
//= require peek/views/rblineprof
//= require peek/views/rblineprof/pygments
#peek
{
#peek
{
background
:
#000
;
background
:
#000
;
...
...
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