[ARVADOS] updated: ec4fecc7a03332d65a86d1d77407f2a4f18f3a3c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb    |   25 +++++++++++++++++++-
 .../config/environments/development.rb.example     |   13 +++-------
 doc/Rakefile                                       |    2 +-
 doc/_config.yml                                    |    9 ++++++-
 .../api/app/controllers/application_controller.rb  |   18 ++++++++------
 .../app/controllers/user_sessions_controller.rb    |    3 +-
 services/api/config/database.yml.sample            |   15 +++++++++++-
 7 files changed, 63 insertions(+), 22 deletions(-)

       via  ec4fecc7a03332d65a86d1d77407f2a4f18f3a3c (commit)
       via  45741702d88801640ca6c59269edb610dc2b6071 (commit)
       via  ad938ff8f1c0ca0493d7e0f37025927f664efad3 (commit)
       via  7722719387453c7ab5f9326536daa2655cad60c9 (commit)
       via  198d4c115e1958e1d9779e58548b8276cae244a8 (commit)
      from  4ac7301cf934c4ae367627efec43e846dcb17343 (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 ec4fecc7a03332d65a86d1d77407f2a4f18f3a3c
Merge: ad938ff 4574170
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Mar 4 21:58:17 2014 -0500

    Merge remote-tracking branch 'origin/master' into make-setting-up-dev-easier


commit ad938ff8f1c0ca0493d7e0f37025927f664efad3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Mar 4 21:57:00 2014 -0500

    Sets default configuration to use sqlite3 which is much easier for setting up a development environment.

diff --git a/apps/workbench/config/environments/development.rb.example b/apps/workbench/config/environments/development.rb.example
index ba3dbbe..35b76d1 100644
--- a/apps/workbench/config/environments/development.rb.example
+++ b/apps/workbench/config/environments/development.rb.example
@@ -35,12 +35,9 @@ ArvadosWorkbench::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  # Log timing data for API transactions
-  config.profiling_enabled = true
-
-  config.arvados_login_base = 'http://arvados.local/login'
-  config.arvados_v1_base = 'http://arvados.local/arvados/v1'
-  config.arvados_insecure_https = true # true = do not check server certificate
+  config.arvados_login_base = 'https://localhost:3001/login'
+  config.arvados_v1_base = 'https://localhost:3001/arvados/v1'
+  config.arvados_insecure_https = false # true = do not check server certificate
 
   config.data_import_dir = '/tmp/arvados-workbench-upload'
   config.data_export_dir = '/tmp/arvados-workbench-download'
@@ -50,9 +47,7 @@ ArvadosWorkbench::Application.configure do
   config.site_name = 'Arvados Workbench (dev)'
   config.activation_contact_link = 'mailto:info at arvados.org'
 
-  config.arvados_docsite = 'http://doc.arvados.org'
-
   config.arvados_theme = 'default'
 
-  config.show_user_agreement_inline = false
+  config.arvados_docsite = 'http://doc.arvados.org'
 end
diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 34a22aa..3146173 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -265,7 +265,7 @@ class ApplicationController < ActionController::Base
       if supplied_token
         api_client_auth = ApiClientAuthorization.
           includes(:api_client, :user).
-          where('api_token=? and (expires_at is null or expires_at > now())', supplied_token).
+          where('api_token=? and (expires_at is null or expires_at > date(\'now\'))', supplied_token).
           first
         if api_client_auth.andand.user
           session[:user_id] = api_client_auth.user.id
@@ -395,13 +395,15 @@ class ApplicationController < ActionController::Base
   end
 
   def render *opts
-    response = opts.first[:json]
-    if response.is_a?(Hash) &&
-        params[:_profile] &&
-        Thread.current[:request_starttime]
-      response[:_profile] = {
-         request_time: Time.now - Thread.current[:request_starttime]
-      }
+    if opts.first
+      response = opts.first[:json]
+      if response.is_a?(Hash) &&
+          params[:_profile] &&
+          Thread.current[:request_starttime]
+        response[:_profile] = {
+          request_time: Time.now - Thread.current[:request_starttime]
+        }
+      end
     end
     super *opts
   end
diff --git a/services/api/app/controllers/user_sessions_controller.rb b/services/api/app/controllers/user_sessions_controller.rb
index 71c2823..3674c01 100644
--- a/services/api/app/controllers/user_sessions_controller.rb
+++ b/services/api/app/controllers/user_sessions_controller.rb
@@ -121,7 +121,8 @@ class UserSessionsController < ApplicationController
     api_client_auth = ApiClientAuthorization.
       new(user: user,
           api_client: @api_client,
-          created_by_ip_address: remote_ip)
+          created_by_ip_address: remote_ip,
+          scopes: ["all"])
     api_client_auth.save!
 
     if callback_url.index('?')
diff --git a/services/api/config/database.yml.sample b/services/api/config/database.yml.sample
index 4dd6a12..4a0c048 100644
--- a/services/api/config/database.yml.sample
+++ b/services/api/config/database.yml.sample
@@ -1,4 +1,17 @@
 development:
   adapter: sqlite3
-  database: arvados_development.sqlite3
+  database: db/arvados_development.sqlite3
+  pool: 5
+  timeout: 5000
 
+test:
+  adapter: sqlite3
+  database: db/arvados_test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/arvados_production.sqlite3
+  pool: 5
+  timeout: 5000

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


hooks/post-receive
--