Merge branch 'master' into 6859-fix-invalid-manifests

[arvados.git] / services / api / lib / josh_id.rb

diff --git a/services/api/lib/josh_id.rb b/services/api/lib/josh_id.rb
index a63b25104cc5b2415324a4d71fc89e75baa2ff73..a7e8ff2fc8d7024b23b309c5b3e2de67abf5741f 100644 (file)
--- a/services/api/lib/josh_id.rb
+++ b/services/api/lib/josh_id.rb
@@ -42,7 +42,7 @@ module OmniAuth
       end
 
       def callback_url
-        full_host + script_name + callback_path + "?return_to=" + CGI.escape(request.params['return_to'])
+        full_host + script_name + callback_path + "?return_to=" + CGI.escape(request.params['return_to'] || '')
       end
 
       def raw_info