Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/peek/views/external_http.rb b/lib/peek/views/external_http.rb
index bd0e4c64127..b925e3db7b6 100644
--- a/lib/peek/views/external_http.rb
+++ b/lib/peek/views/external_http.rb
@@ -86,12 +86,16 @@ module Peek
         uri.hostname = call[:host]
         uri.port = call[:port]
         uri.path = call[:path]
-        uri.query = call[:query]
+        uri.query = generate_query(call[:query])
 
         uri.to_s
-      rescue URI::Error
+      rescue StandardError
         'unknown'
       end
+
+      def generate_query(query_string)
+        query_string.is_a?(Hash) ? query_string.to_query : query_string.to_s
+      end
     end
   end
 end