[ARVADOS] updated: fad433ed99dffb9fd003c5dfd5f7bad770b19206
git at public.curoverse.com
git at public.curoverse.com
Sun Aug 3 16:19:44 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 1 +
apps/workbench/Gemfile.lock | 2 +
.../workbench/app/assets/javascripts/filterable.js | 4 +-
.../app/assets/javascripts/select_modal.js | 51 ++++++++++++++--
.../app/controllers/actions_controller.rb | 6 +-
.../app/controllers/application_controller.rb | 4 +-
.../workbench/app/controllers/search_controller.rb | 13 +++-
apps/workbench/app/controllers/users_controller.rb | 67 +++++++++++++++++++++
apps/workbench/app/views/application/404.html.erb | 7 ++-
.../workbench/app/views/application/_choose.js.erb | 1 -
.../workbench/app/views/application/index.html.erb | 2 +
apps/workbench/app/views/layouts/body.html.erb | 53 ++++++++--------
.../app/views/search/_choose_rows.html.erb | 8 ++-
.../app/views/users/_add_ssh_key_popup.html.erb | 38 ++++++++++++
.../app/views/users/_manage_account.html.erb | 52 ++++++++++++++++
.../app/views/users/_manage_current_token.html.erb | 13 ++++
.../app/views/users/_manage_repositories.html.erb | 40 ++++++++++++
.../app/views/users/_manage_ssh_keys.html.erb | 55 +++++++++++++++++
.../views/users/_manage_virtual_machines.html.erb | 50 +++++++++++++++
apps/workbench/app/views/users/add_ssh_key.js.erb | 2 +
.../app/views/users/add_ssh_key_popup.js.erb | 8 +++
.../app/views/users/manage_account.html.erb | 1 +
apps/workbench/config/routes.rb | 3 +
doc/_includes/_ssh_addkey.liquid | 10 +--
doc/images/ssh-adding-public-key.png | Bin 17463 -> 15117 bytes
doc/user/reference/api-tokens.html.textile.liquid | 39 +++---------
docker/build_tools/Makefile | 30 +++++----
docker/build_tools/list_generated_files | 14 -----
services/api/Gemfile | 1 +
services/api/Gemfile.lock | 2 +
.../controllers/arvados/v1/groups_controller.rb | 28 +++++----
.../app/controllers/arvados/v1/jobs_controller.rb | 20 +++---
services/api/app/models/arvados_model.rb | 6 ++
services/api/app/models/authorized_key.rb | 9 +--
... => 20140607150616_rename_folder_to_project.rb} | 0
.../db/migrate/20140714184006_empty_collection.rb | 4 +-
services/api/db/structure.sql | 2 +
services/api/lib/current_api_client.rb | 2 +-
.../test/fixtures/api_client_authorizations.yml | 6 ++
services/api/test/fixtures/links.yml | 46 ++++++++++++++
services/api/test/fixtures/users.yml | 11 ++++
.../arvados/v1/groups_controller_test.rb | 33 ++++++++++
.../arvados/v1/job_reuse_controller_test.rb | 21 +++++++
services/fuse/tests/test_mount.py | 1 +
44 files changed, 628 insertions(+), 138 deletions(-)
create mode 100644 apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
create mode 100644 apps/workbench/app/views/users/_manage_account.html.erb
create mode 100644 apps/workbench/app/views/users/_manage_current_token.html.erb
create mode 100644 apps/workbench/app/views/users/_manage_repositories.html.erb
create mode 100644 apps/workbench/app/views/users/_manage_ssh_keys.html.erb
create mode 100644 apps/workbench/app/views/users/_manage_virtual_machines.html.erb
create mode 100644 apps/workbench/app/views/users/add_ssh_key.js.erb
create mode 100644 apps/workbench/app/views/users/add_ssh_key_popup.js.erb
create mode 100644 apps/workbench/app/views/users/manage_account.html.erb
delete mode 100755 docker/build_tools/list_generated_files
rename services/api/db/migrate/{20140607150616_rename_folder_to_project.rb_deferred => 20140607150616_rename_folder_to_project.rb} (100%)
via fad433ed99dffb9fd003c5dfd5f7bad770b19206 (commit)
via f0a746bb545d7db0760cd397c849315787c5231a (commit)
via 80ada0673ac37cf1d3b70918a214f2ade484ec45 (commit)
via c81c0efd74addbdb2cf3ef2114ed96123d5a881e (commit)
via ee56bdc1c7868ddae32e919205e77a3125a2a5e3 (commit)
via fada92364f7ab0aa7074f1b260b4d79ca7ab55eb (commit)
via d579e7069ab2df27493180a36f2830ba7c10e6a6 (commit)
via b01bc9f64291554fea0e548d18081bb0fd1a7342 (commit)
via ee91e2ebc7759e1823edd376db938a785ad62f45 (commit)
via ad02c4a8569b1cbf7336b5d65beb065e17420d56 (commit)
via 42d84bd014b3ab3a1906c9ba68b39835765fe705 (commit)
via 09e3c7102376790a2a6bebb0c77f43fa271f6d74 (commit)
via 3bdc5e4dee5990218885f68a3463c230135396ea (commit)
via c69a557d26d65b0a89a363d23b86f50fd7d0e9bd (commit)
via ea94b2feb2cba9ee11b728256a8c947fb46f8493 (commit)
via c7bf82b621dae10a68a74b95439fa8f4ae3c502f (commit)
via da7d1fa4d078d0d7785672a195b16a9134478b0d (commit)
via 30c1cff48b0cb14e28a8b5d77b78029997c8521a (commit)
via 0a8e8fd2fbefe1630b99725b1ca1f17ab424f556 (commit)
via 5e3197461ae340eeabb41f459fddd14861d91e7d (commit)
via d1d80a45ac9092c3da1aeda3b43e911569765041 (commit)
via e7832d6afbd8ac8122c4c9ff907c5234d05276a1 (commit)
via 5a5f0c4530975aaf259dc93b32a3bab449d2b008 (commit)
via 01d0323bec359b6e52705163f55a847ce494dc29 (commit)
via 5b305bba25a4616fa88377b3fd4871b351caf636 (commit)
via f91557687f656e11b9ddad08be2243677ebe6cec (commit)
via 76b8c9664d1f3bd4f1513fa86735f29639d0bb11 (commit)
via 079d6e0e42bfde5f21bd00e963c3a180d2950f5b (commit)
via b2b6b598deb6d09a0de1560fcf4b36ab8c66a369 (commit)
via 20e4662b703bf305428e223edb98c47d464ccf51 (commit)
via 4ec57503920f7cd47a48cb0d0cf089517b8d2dd3 (commit)
via 0345bf3c3085c0bda41e3d3f45d2447e45165b65 (commit)
via 18b51b1ff1f40f1c0467f1960b329c7bc317322d (commit)
via f595e7b488f1056e3698ca01f6c1e715ce63929f (commit)
via 38c87cca0040ecaa6b3aabeaacf9151f8712f0d3 (commit)
via 61ce85085a98514a5e694fa40b46f4eb432d55f5 (commit)
via 9a07feb6e747e88e4bd3f43e2c2b77954b9e6a19 (commit)
via 98721242a9eff3f0f21a75aaac0ce3abeb7c3391 (commit)
via 249979c4f51961364f1f7412e20266b5746b14ac (commit)
via 5d834e3837b2afc830c79f75e121a524d93806c0 (commit)
via ab58549b6249224decdb913097f1649e993b95a7 (commit)
via fc68ff843ed4e665ec67c126c43c9edee5de8d3f (commit)
via 45dd2c3f3db472132974aeb4fe3f0e0f4e57dd13 (commit)
via 04cdd8c9292523aaca50ff6f41791ea54ee91e3b (commit)
via ec34701537a4de8f7aff3b7f91b4402367ebb22a (commit)
via 4b007d7c702987f3b65d0c3fec5b21dcf6ac647c (commit)
via 6790e24febd872dcf98b1356ad1d06fc69fc2915 (commit)
via c378aa30f0942a58f3f504edf61233296d671eff (commit)
via 1b452d6b3903bac1ccd71b2bb2d9884ae1274f44 (commit)
via 4aae92930a32c99bc803ddfedc7b21715a5a77b7 (commit)
via d82f1a45af0702c68b6bf93b887a8c94c078ce4d (commit)
via 08c991e7ce24f6424b0916dec3d6077e56ffcdba (commit)
via 96475eb001b8e291a4923bb27ef0b97d2d9702c8 (commit)
via dc3ecef74c3d69329bfa20ea6b81ff9c9488bca8 (commit)
via 656cf0fc10b40f6a9a76a24bae12f189dffae5e5 (commit)
via 19c20b239f9d88f6fd4dab542524143f24cc8536 (commit)
via a2efd7925361ae71ee2abae987fa1b4801ac0555 (commit)
via 984c751aaa4304b4535fe1ebf099d66bc13c30f4 (commit)
via 336e990ac85fa7732c021a3051abfa6977b54445 (commit)
via 5c8437e59cbfd13b99d402b42b6bdfc18aa82bf8 (commit)
via 72ea413fc98371c50196f337f104807ab7472288 (commit)
via 41d206a19a04a87e3bb54ed9a41bb7a1f9cf966f (commit)
via 2afb2391969061c5504e7224f38ab9e5d7bfd023 (commit)
via aead83a0bf17c6fd738a15e5a467c1b02274131e (commit)
via 635dc811d13d8a4348a0c8a047ae6b6a4ee58aa7 (commit)
via 490a1de3cdad334315b75687578217efb57cfaf6 (commit)
via 8722cd175d66ae707ba1ce2efa15b572678f545c (commit)
via aa31de9c4cc3b820c906b4b915ba3e5f5aa4ad87 (commit)
via 514ba2679d20b269f4ab37415d0217589477e7f6 (commit)
via 2f13152e6e81dada55b7e14f9cd981156d60d561 (commit)
via dd2634cad1db669ce19237805bb7fa83a1913d26 (commit)
via 15b37dc4af33f1b5fe3e5ca1773ff7cb53a80607 (commit)
via 5adca9b05d740be31040477b43396f498429e6b3 (commit)
via a1deb1992d8a3b83ef7806ac9b193a56282032c6 (commit)
from 5ce0e0fe745c8d3e0f23629f26eeb8b0d01923db (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 fad433ed99dffb9fd003c5dfd5f7bad770b19206
Merge: f0a746b 80ada06
Author: Ward Vandewege <ward at curoverse.com>
Date: Sun Aug 3 22:17:15 2014 +0200
Merge branch 'master' into 3261-keep-docker-config
commit f0a746bb545d7db0760cd397c849315787c5231a
Author: Ward Vandewege <ward at curoverse.com>
Date: Sun Aug 3 22:16:59 2014 +0200
3261: simplify Makefile
diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 240e820..09c09cc 100644
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -52,8 +52,6 @@ deepclean: clean
CONFIG_RB = build_tools/config.rb
-LIST_GENERATED_FILES = build_tools/list_generated_files
-
BUILD = build/.buildstamp
BASE_DEPS = base/Dockerfile config.yml $(BASE_GENERATED)
@@ -84,26 +82,26 @@ BCBIO_NEXTGEN_DEPS = bcbio-nextgen/Dockerfile
BASE_GENERATED = base/generated/arvados.tar.gz
-COMPUTE_GENERATED_IN = $(shell ls compute/*.in)
-COMPUTE_GENERATED = $(shell $(LIST_GENERATED_FILES) $(COMPUTE_GENERATED_IN))
+COMPUTE_GENERATED_IN = compute/*.in
+COMPUTE_GENERATED = compute/generated/*
-KEEP_GENERATED_IN = $(shell ls keep/*.in)
-KEEP_GENERATED = $(shell $(LIST_GENERATED_FILES) $(KEEP_GENERATED_IN))
+KEEP_GENERATED_IN = keep/*.in
+KEEP_GENERATED = keep/generated/*
-API_GENERATED_IN = $(shell ls api/*.in)
-API_GENERATED = $(shell $(LIST_GENERATED_FILES) $(API_GENERATED_IN))
+API_GENERATED_IN = api/*.in
+API_GENERATED = api/generated/*
-SHELL_GENERATED_IN = $(shell ls shell/*.in)
-SHELL_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SHELL_GENERATED_IN))
+SHELL_GENERATED_IN = shell/*.in
+SHELL_GENERATED = shell/generated/*
-SLURM_GENERATED_IN = $(shell ls slurm/*.in)
-SLURM_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SLURM_GENERATED_IN))
+SLURM_GENERATED_IN = slurm/*.in
+SLURM_GENERATED = slurm/generated/*
-WORKBENCH_GENERATED_IN = $(shell ls workbench/*.in)
-WORKBENCH_GENERATED = $(shell $(LIST_GENERATED_FILES) $(WORKBENCH_GENERATED_IN))
+WORKBENCH_GENERATED_IN = workbench/*.in
+WORKBENCH_GENERATED = workbench/generated/*
-SSO_GENERATED_IN = $(shell ls sso/*.in)
-SSO_GENERATED = $(shell $(LIST_GENERATED_FILES) $(SSO_GENERATED_IN))
+SSO_GENERATED_IN = sso/*.in
+SSO_GENERATED = sso/generated/*
$(BUILD):
mkdir -p build
diff --git a/docker/build_tools/list_generated_files b/docker/build_tools/list_generated_files
deleted file mode 100755
index 170ee53..0000000
--- a/docker/build_tools/list_generated_files
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env ruby
-
-# list_generated_files file1 file2...
-#
-# Prints a list of the "generated" files that correspond to the files
-# listed on the command line.
-#
-# e.g.:
-# list_generated_files keep/config.rb.in api/application.yml.in
-# -> keep/generated/config.rb api/generated/application.yml
-
-print ARGV.collect { |f|
- File.join(File.dirname(f), "generated", File.basename(f, ".in"))
-}.join(" "), "\n"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list