[ARVADOS] updated: 702ff97546e9050155658135694c55a0568be1d5

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/layouts/body.html.erb                 | 4 ++--
 apps/workbench/test/controllers/application_controller_test.rb | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

       via  702ff97546e9050155658135694c55a0568be1d5 (commit)
      from  0fb40a0d01d6e6500ea6f87e45476daab511a1f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 702ff97546e9050155658135694c55a0568be1d5
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Nov 12 15:12:28 2015 -0500

    Fixup last commit per review.

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 927bbda..acb056e 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -138,10 +138,10 @@
               <li><%= link_to 'Browse public projects', "/projects/public" %></li>
             <% end %>
             <li class="dropdown hover-dropdown login-menu">
-              <a href="<%= arvados_api_client.arvados_login_url(return_to: request.fullpath) %>">Log in</a>
+              <a href="<%= arvados_api_client.arvados_login_url(return_to: request.url) %>">Log in</a>
               <ul class="dropdown-menu">
                 <li>
-                  <a href="<%= arvados_api_client.arvados_login_url(return_to: request.fullpath) %>">
+                  <a href="<%= arvados_api_client.arvados_login_url(return_to: request.url) %>">
                     <span class="fa fa-lg fa-sign-in"></span>
                     <p style="margin-left: 1.6em; margin-top: -1.35em; margin-bottom: 0em; margin-right: 0.5em;">Log in or register with<br/>any Google account</p>
                   </a>
diff --git a/apps/workbench/test/controllers/application_controller_test.rb b/apps/workbench/test/controllers/application_controller_test.rb
index 001bafd..ef2a989 100644
--- a/apps/workbench/test/controllers/application_controller_test.rb
+++ b/apps/workbench/test/controllers/application_controller_test.rb
@@ -346,8 +346,11 @@ class ApplicationControllerTest < ActionController::TestCase
       get(:show, {id: test_uuid})
       login_link = css_select(css_selector).first
       assert_not_nil(login_link, "failed to select login link")
+      login_href = URI.unescape(login_link.attributes["href"])
+      # The parameter needs to include the full URL to work.
+      assert_includes(login_href, "://")
       assert_match(/[\?&]return_to=[^&]*\/projects\/#{test_uuid}(&|$)/,
-                   URI.unescape(login_link.attributes["href"]))
+                   login_href)
     end
   end
 

-----------------------------------------------------------------------


hooks/post-receive
--