[ARVADOS] updated: 89397b66ebc9b8ec82d806fe6a2af2bbefd01161

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/.gitignore                          |    3 +
 apps/workbench/app/assets/javascripts/users.js     |   40 ++++++++++++++++++++
 .../app/controllers/application_controller.rb      |    8 +++-
 apps/workbench/app/models/arvados_api_client.rb    |    2 +-
 .../workbench/app/views/application/error.json.erb |    1 +
 .../app/views/authorized_keys/create.js.erb        |    1 +
 .../app/views/users/_notifications.html.erb        |   19 +++++++--
 .../api/app/controllers/application_controller.rb  |    9 +++-
 services/api/app/models/authorized_key.rb          |   19 +++++++++
 9 files changed, 91 insertions(+), 11 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/users.js
 create mode 100644 apps/workbench/app/views/application/error.json.erb
 create mode 100644 apps/workbench/app/views/authorized_keys/create.js.erb

       via  89397b66ebc9b8ec82d806fe6a2af2bbefd01161 (commit)
       via  d14c127786e9ad5490a700654ee513aaa0c53db6 (commit)
       via  e1ed5c20e3edc31c7aefe3257679b0db6f3c3316 (commit)
       via  5a2dd6a86ac170ea709b60c7f243ba9216cd0843 (commit)
       via  b29b5f97cf4f571114d0c73794b508d65af4331c (commit)
       via  906a43f38efe61f049fda03ff28f407837193a7a (commit)
       via  b2d3257922b14b44ab628260f1fb51a68bef95a2 (commit)
       via  0e847d07bd66e554822eb0854bbaee312eeba839 (commit)
       via  09898bcec15c30328ae9e720e9a0c7be1595a004 (commit)
       via  7ad430f157028a8f8ab52c6f17c4864ada271667 (commit)
       via  d8fde97325067566bcdb877795eaa56a8ee8c201 (commit)
      from  69fab19d5c5fdb685a4b6651ac2077a467a6ca9a (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 89397b66ebc9b8ec82d806fe6a2af2bbefd01161
Merge: d14c127 e1ed5c2
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jan 17 13:50:19 2014 -0800

    Merge branch '1880-check-duplicate-public-key'
    
    closes #1880


commit d14c127786e9ad5490a700654ee513aaa0c53db6
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jan 17 08:00:43 2014 -0800

    Add themes to .gitignore in apps/workbench

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index 7a4b0ff..89efb81 100644
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -31,3 +31,6 @@
 # Capistrano files are coming from another repo
 /Capfile*
 /config/deploy*
+
+# Themes are coming from another repo
+/themes/*

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


hooks/post-receive
--