[ARVADOS] updated: ad6e6f2457f354b666cdc322915d591743a4cd2f
git at public.curoverse.com
git at public.curoverse.com
Fri Apr 11 11:27:20 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 3 +-
apps/workbench/Gemfile.lock | 2 +
apps/workbench/README.textile | 6 +-
.../app/assets/javascripts/application.js | 1 +
apps/workbench/app/controllers/users_controller.rb | 92 ++++++++-
apps/workbench/app/models/user.rb | 4 +
.../workbench/app/views/application/index.html.erb | 19 ++-
.../app/views/layouts/application.html.erb | 1 +
.../pipeline_instances/_show_components.html.erb | 8 +-
.../app/views/pipeline_instances/show.js.erb | 15 ++-
.../app/views/users/_setup_popup.html.erb | 69 ++++++
.../workbench/app/views/users/_show_admin.html.erb | 10 +
apps/workbench/app/views/users/setup.js.erb | 2 +
apps/workbench/app/views/users/setup_popup.js.erb | 44 ++++
apps/workbench/config/application.default.yml | 1 +
apps/workbench/config/routes.rb | 3 +
apps/workbench/test/integration/users_test.rb | 219 ++++++++++++++++++++
sdk/cli/bin/crunch-job | 1 +
.../app/controllers/arvados/v1/users_controller.rb | 3 +-
services/api/app/models/user.rb | 95 ++++++---
services/api/config/database.yml.sample | 4 +-
services/api/test/fixtures/jobs.yml | 2 +
.../functional/arvados/v1/users_controller_test.rb | 26 ++-
services/api/test/unit/user_test.rb | 10 +-
services/keep/keep.go | 70 +++----
services/keep/keep_test.go | 73 ++++++--
26 files changed, 675 insertions(+), 108 deletions(-)
create mode 100644 apps/workbench/app/views/users/_setup_popup.html.erb
create mode 100644 apps/workbench/app/views/users/setup.js.erb
create mode 100644 apps/workbench/app/views/users/setup_popup.js.erb
create mode 100644 apps/workbench/test/integration/users_test.rb
via ad6e6f2457f354b666cdc322915d591743a4cd2f (commit)
via 9bcbc09d57774d068a3867c2630a4b69a59b4812 (commit)
via 27cb596cfbff2f81210260d49f824bfdbac6dd5d (commit)
via 1bb8374adcc014d4898d8ebfadf2bcb119262f0b (commit)
via 51db46ba942baf7f718ae12544008e6f6b2f7ea4 (commit)
via c6763b5de6a0dc98493bf288472134db0ac22ffa (commit)
via 506e5678188ff5a51d4e38558fe8fc0fb4357be2 (commit)
via e3193d31ed03056cff6c9d21e0b3cc8898d184a4 (commit)
via 013ced576824a05cd9a162fbd11e65d4d183a6d5 (commit)
via 38dea652d11a2a562623d80328d270707ed44887 (commit)
via b452636351b19ed5641a20eabc68881bd8905ca4 (commit)
via bb3a7e08a90ea7826c0b0e1289c64b395b472151 (commit)
via de3768fdd71eb58cf040d72b0d989deeb0bb75ae (commit)
via b16daa6053ebc15d306c29c01a2134f420e3dab1 (commit)
via e35ed29187d83ebd4cbc493b9251119013825ac1 (commit)
via c2bd59c55177f431d91c21521196f421d5ffb88f (commit)
via e9ee7a48d3f95d41f5b17d4c1c5c65471ff0b598 (commit)
via 71b0d0fb51e3c54a7959f51fd4dbf523fbaf57db (commit)
via 6ea2e62b70a015226c4f3361ab3591509100a820 (commit)
via 7e28b26cc58f9d5833ffac6760a99a6a037e4770 (commit)
via c6bc2555aae64b937e022637f1fe2c279e1e4936 (commit)
via e4b0ff638bb41ce55ab3770c4f2b7f744d653aac (commit)
via 50ee9817061629f9ffe2568f937149f6e877df04 (commit)
via a6c0c9dccbe036132c110817d69c08b757aab5fa (commit)
via 7488683807205fdfebd3c52e6ba50a0879ef1da7 (commit)
via 351718c4524ede8442f1cc078d61ced8839440c5 (commit)
via 0c632a2429105322f793809f1ab5bb158050ed56 (commit)
via da1c3891473b02f891eaa0af3d9d799ec6b6ed54 (commit)
via 6783336d968c8e47ad63e929086aa704299bb403 (commit)
via 3dd13d1a0643fdcc9e4f391b74b2496ca2ebbc7c (commit)
via dcbdaf47dd1486f58893413c07a9cb5c6d180923 (commit)
via c7b2768cd590b633fe4154dedec2d8ad387a9d9b (commit)
via a0d41ce990cf0a6fcd516a6a10f662a85258238c (commit)
via 19d60097652447fe7c71ec78f5c8d52a7002b3b8 (commit)
via 4c179135909d37a6cd9722af909785393d9e117d (commit)
via 64d449da29bbbe6bce2b54a2ed67eb4cb44243c9 (commit)
via c7f17227456c27d71bca83895c84bc83fb3b4ec5 (commit)
via 2908852ef9d52b12eb715474c5f31e35f7c44b18 (commit)
via 11a9f64426c1fc50529e694fead97f81e6eb4457 (commit)
via e9339eb1983e33798270f61f57d90cde4b656bd8 (commit)
via 8ea149362539b3d50e14a7fbd8831c7cbf347446 (commit)
via 847b4a5d6e179dde49295a7118962e764d63e544 (commit)
via 1d6d51202a936a28eee2384ceaa7c725813a2b03 (commit)
via d0dc31b9feb56c026f7c7ae0d46e63434b46742f (commit)
via a6724f72c5a93edf2b8a456783a474024743f1ff (commit)
via cbdb5dc18ccbd8cd2cdc4ebeaace82aa33b36f70 (commit)
via 1418580063cbe02ab3376adb27928c5325ba10b3 (commit)
via a3212e71057712af58a7d2b849d69915b4fd79b1 (commit)
via 59b0a3a8e5209ef85967a93c500167b7cf882757 (commit)
via 9349484f1e607064cf96fa7f7212979d30e58448 (commit)
via 0f92cdd76a8ecc456e0ab068abce468e3a169bc0 (commit)
via fdbdc0cdecb027265dccef0810b189e578cb8c60 (commit)
via 0b76b475d2e1dc33bd80de9923d99009231e6671 (commit)
via 4d918da1c7f7499d19491d44ecead48008d2fe1e (commit)
via 38f8414fb8357b57ab3b859b7721676d62dfe984 (commit)
via eba6e6988be540b8d6015903e58d8acf71476149 (commit)
via 7043cad00647bc44f83586d895b70f950d5a26c2 (commit)
via 043a17b21c0f18eaaddcdd5d1144989c1d48e3e2 (commit)
via 2c5412052d38751d538696c9d5cbb0b8adbfd1a6 (commit)
via 4e3dca8c84d77baaa1a58c195204f91da5f4176d (commit)
via 2c292c1942746dfa7b93411d76a8374e1b0aff16 (commit)
via c267f657aae5d43389a41861c2b9649c30482468 (commit)
via b8ee1ea826cd2f02233893e8e06bac5fc44bb473 (commit)
via 55684214f941cf73ce1eb542943dea24a17d48e5 (commit)
via cb2c6a830abda3390146a4933b8cd8ce6ed55d31 (commit)
via 8f8feb2866fd36bbc44188116d3bed6e4a4109a4 (commit)
via 190fe9cdc4ea41267a89f8c0e54dbc179cd1e4b8 (commit)
via 9d9b194941e7d3c9b459d27657e3c3c67bf388b8 (commit)
via 835332abdd0fb8d0046529ff4d2f026f67736418 (commit)
via e8dea4fda0347c612ba6b0d4a8045916febeb680 (commit)
via a2164fe94a9909e5b38856b881a1d856f822747d (commit)
via 47d130ae61a2aa0c637060d4a5be9f3728af30b7 (commit)
via 5a7b7aa6a6a11b5e0a397d01a6fe527169ed5f15 (commit)
via 4efa06e83f82096b70c03192bce74df96ed230c5 (commit)
via 9f87668ecf0768f83b95253d8888481b1d8ff95e (commit)
via e6e7736641231fe43b5f68bf4d0653d4321bbc36 (commit)
via 4882cd9ebd6311c4f84d8efff21561b1a229e244 (commit)
via 33d7da6903a0fc2c9570a11c939dce6a4894f66e (commit)
via a992c11d76c013d42470a5142714d68e918bccfa (commit)
via 20e876e9d9809d6097da440453c20f737229ee28 (commit)
via 1697fcdd746eb5a30127275e533c3d799aa9f681 (commit)
via 921ec0ddab4c949659d54490204acdd431986450 (commit)
via c6cb3423e9ca2b421bda3bb97c1448dcde19df97 (commit)
via 3ca0861ae65a9c61f0db226bbe9f70cfc0a4ec7b (commit)
via fe0d9b8e3a46c610deb95b9a8b501e8c2aad9f54 (commit)
via cb19d007add188f2c83a082c419ee0b523fb664b (commit)
via a15ff495c8c576378f55f58fe22ce9f3c49121e8 (commit)
from 7ca1198b2e64cdd823f424c1bd009f364abfe2d0 (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 ad6e6f2457f354b666cdc322915d591743a4cd2f
Merge: 7ca1198 9bcbc09
Author: Tim Pierce <twp at curoverse.com>
Date: Fri Apr 11 11:29:04 2014 -0400
Merge branch '2449-keep-write-blocks' into 2449-keep-flags
diff --cc services/keep/keep.go
index 897e504,7cca534..85e2aea
--- a/services/keep/keep.go
+++ b/services/keep/keep.go
@@@ -5,9 -5,9 +5,10 @@@ import
"bytes"
"crypto/md5"
"errors"
+ "flag"
"fmt"
"github.com/gorilla/mux"
+ "io/ioutil"
"log"
"net/http"
"os"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list