summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-07 16:51:15 +0200
committerRémy Coutable <remy@rymai.me>2017-06-09 17:21:39 +0200
commitd16a3cf7fc350023da65a5080214765ade2e1aa1 (patch)
treed37f06e7a9d26fa0e79fdcf6b5f094d3459beebc
parentda3ad00cf15aa5d3c3724b412d56a0cba3a270b5 (diff)
downloadgitlab-ce-d16a3cf7fc350023da65a5080214765ade2e1aa1.tar.gz
Fix replacement of Pygments with Rouge
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/assets/javascripts/peek.js8
-rw-r--r--lib/peek/rblineprof/custom_controller_helpers.rb2
-rw-r--r--vendor/assets/javascripts/peek.rblineprof.js5
-rw-r--r--vendor/assets/stylesheets/peek.scss1
4 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/javascripts/peek.js b/app/assets/javascripts/peek.js
index 33ad9024591..06a07c19e09 100644
--- a/app/assets/javascripts/peek.js
+++ b/app/assets/javascripts/peek.js
@@ -1,15 +1,19 @@
import 'vendor/peek';
import 'vendor/peek.performance_bar';
-import 'vendor/peek.rblineprof';
(function() {
$(document).on('click', '#peek-show-queries', function(e) {
- console.log('peek!');
var $modal;
+ $('.peek-rblineprof-modal').hide();
$modal = $('#modal-peek-pg-queries');
if ($modal.length) {
$modal.modal('toggle');
}
return e.preventDefault();
});
+
+ $(document).on('click', '.js-lineprof-file', function(e) {
+ $(this).parents('.heading').next('div').toggle();
+ return e.preventDefault();
+ });
}).call(window);
diff --git a/lib/peek/rblineprof/custom_controller_helpers.rb b/lib/peek/rblineprof/custom_controller_helpers.rb
index 4ea4ba45e38..796420971b5 100644
--- a/lib/peek/rblineprof/custom_controller_helpers.rb
+++ b/lib/peek/rblineprof/custom_controller_helpers.rb
@@ -77,7 +77,7 @@ module Peek
output << "<pre class='duration'>#{times.join("\n")}</pre>"
# The following line was changed from
# 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
end
diff --git a/vendor/assets/javascripts/peek.rblineprof.js b/vendor/assets/javascripts/peek.rblineprof.js
deleted file mode 100644
index cad6e24d40e..00000000000
--- a/vendor/assets/javascripts/peek.rblineprof.js
+++ /dev/null
@@ -1,5 +0,0 @@
-$(document).on('click', '.js-lineprof-file', function(e) {
- $(this).parents('.heading').next('div').toggle();
- e.preventDefault();
- return false;
-});
diff --git a/vendor/assets/stylesheets/peek.scss b/vendor/assets/stylesheets/peek.scss
index 344cf656bab..b4b4f6d158f 100644
--- a/vendor/assets/stylesheets/peek.scss
+++ b/vendor/assets/stylesheets/peek.scss
@@ -1,6 +1,5 @@
//= require peek/views/performance_bar
//= require peek/views/rblineprof
-//= require peek/views/rblineprof/pygments
#peek {
background: #000;