Add latest changes from gitlab-org/gitlab@12-6-stable-ee

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/error_tracking/stack_trace_highlight_decorator.rb b/lib/gitlab/error_tracking/stack_trace_highlight_decorator.rb
index a403275fd4e..1e490e52c43 100644
--- a/lib/gitlab/error_tracking/stack_trace_highlight_decorator.rb
+++ b/lib/gitlab/error_tracking/stack_trace_highlight_decorator.rb
@@ -28,7 +28,7 @@ module Gitlab
       end
 
       def highlight_entry_context(filename, context)
-        language = Rouge::Lexer.guess_by_filename(filename).tag
+        language = guess_language_by_filename(filename)
 
         context.map do |line_number, line_of_code|
           [
@@ -38,6 +38,12 @@ module Gitlab
           ]
         end
       end
+
+      def guess_language_by_filename(filename)
+        Rouge::Lexer.guess_by_filename(filename).tag
+      rescue Rouge::Guesser::Ambiguous => e
+        e.alternatives.min_by(&:tag)&.tag
+      end
     end
   end
 end