[ARVADOS] updated: 1f5561a43693243ad3b6737dcd1020cbe0cc809f

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |   14 ++-
 .../app/controllers/collections_controller.rb      |   14 ++-
 apps/workbench/app/models/arvados_api_client.rb    |    8 ++
 apps/workbench/app/models/arvados_resource_list.rb |   15 +++
 .../app/views/application/_paging.html.erb         |  120 ++++++++++++++++++++
 .../app/views/application/_show_recent.html.erb    |    4 +
 .../app/views/collections/_show_recent.html.erb    |    6 +-
 .../app/views/groups/_show_recent.html.erb         |    4 +
 .../views/pipeline_instances/_show_recent.html.erb |    4 +
 .../views/pipeline_templates/_show_recent.html.erb |    4 +
 .../api/app/controllers/application_controller.rb  |   26 ++++-
 .../controllers/arvados/v1/schema_controller.rb    |   11 ++-
 .../app/controllers/arvados/v1/users_controller.rb |    2 +-
 services/api/config/application.default.yml        |    3 +
 14 files changed, 225 insertions(+), 10 deletions(-)
 create mode 100644 apps/workbench/app/views/application/_paging.html.erb

       via  1f5561a43693243ad3b6737dcd1020cbe0cc809f (commit)
       via  00a420599077a5063aba449fe9986a765db6bdb3 (commit)
       via  e6c5563c60df03d4d061a6b301b730f0672b69a5 (commit)
       via  e63c37081683a418bf1ad7b9428ffaf24fe6a8f1 (commit)
       via  44e147b16322f9bdd4606cda7deec631b951ab06 (commit)
       via  18358de3cd35ef29e8826f45897a3373a79de291 (commit)
       via  338bd17ff7567dca951a96192564537eca1c974d (commit)
      from  24e20b5eb6f6e021b7f6789ce6e6b4c5a8c678be (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 1f5561a43693243ad3b6737dcd1020cbe0cc809f
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Thu Mar 20 11:07:24 2014 -0400

    Use rails configuration for default openid prefix.

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 84de9b8..367374a 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -93,7 +93,7 @@ class Arvados::V1::UsersController < ApplicationController
     if params[:openid_prefix]   # check if default openid_prefix needs to be overridden
       openid_prefix = params[:openid_prefix]
     else 
-      openid_prefix = 'https://www.google.com/accounts/o8/id'   # default openid prefix
+      openid_prefix = Rails.configuration.openid_prefix
     end
     login_perm_props = {identity_url_prefix: openid_prefix}
 
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index e46ff5d..550d2a0 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -99,3 +99,6 @@ common:
 
   # Version of your assets, change this if you want to expire all your assets
   assets.version: "1.0"
+
+  # default openid prefix to authenticate user
+  openid_prefix: "https://www.google.com/accounts/o8/id"

commit 00a420599077a5063aba449fe9986a765db6bdb3
Merge: 24e20b5 e6c5563
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Thu Mar 20 10:19:01 2014 -0400

    Merge branch 'master' into 2187-enhance-user-setup


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


hooks/post-receive
--