summaryrefslogtreecommitdiff
path: root/app/views/sherlock
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2016-06-06 18:27:26 -0400
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-06-06 18:27:26 -0400
commitfbd2169f9948ee039efe96f48229f4c9ced8c412 (patch)
treeed5bd0ec6a0c9416bc62f99ab5ea4a0977c31cef /app/views/sherlock
parent740a6ecba07a056fca481622b4fa89939c225987 (diff)
downloadgitlab-ce-fbd2169f9948ee039efe96f48229f4c9ced8c412.tar.gz
Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlock
Remember to configure your `better_errors` editor to point to your program of preference
Diffstat (limited to 'app/views/sherlock')
-rw-r--r--app/views/sherlock/queries/_backtrace.html.haml6
-rw-r--r--app/views/sherlock/queries/_general.html.haml8
2 files changed, 11 insertions, 3 deletions
diff --git a/app/views/sherlock/queries/_backtrace.html.haml b/app/views/sherlock/queries/_backtrace.html.haml
index 5c9294c0ab5..30e956e5f40 100644
--- a/app/views/sherlock/queries/_backtrace.html.haml
+++ b/app/views/sherlock/queries/_backtrace.html.haml
@@ -6,7 +6,11 @@
%ul.well-list
- @query.application_backtrace.each do |location|
%li
- = location.path
+ %strong
+ - if defined?(BetterErrors)
+ = link_to(location.path, BetterErrors.editor[location.path, location.line])
+ - else
+ = location.path
%small.light
= t('sherlock.line')
= location.line
diff --git a/app/views/sherlock/queries/_general.html.haml b/app/views/sherlock/queries/_general.html.haml
index 549b47430e6..7073c0f4d90 100644
--- a/app/views/sherlock/queries/_general.html.haml
+++ b/app/views/sherlock/queries/_general.html.haml
@@ -11,13 +11,17 @@
= @query.duration.round(4)
= t('sherlock.milliseconds')
%li
+ - frame = @query.last_application_frame
%span.light
#{t('sherlock.origin')}:
%strong
- = @query.last_application_frame.path
+ - if defined?(BetterErrors)
+ = link_to(frame.path, BetterErrors.editor[frame.path, frame.line])
+ - else
+ = frame.path
%small.light
= t('sherlock.line')
- = @query.last_application_frame.line
+ = frame.line
.panel.panel-default
.panel-heading