[ARVADOS] updated: 0af57aeb8478b0cf0c54c99788e7c72d89d0fa5f
git at public.curoverse.com
git at public.curoverse.com
Wed Jul 15 15:42:02 EDT 2015
Summary of changes:
.../pipeline_instances/_running_component.html.erb | 3 +-
.../_show_components_running.html.erb | 12 +-
doc/_config.yml | 3 +
doc/_includes/_arv_copy_expectations.liquid | 3 +
doc/images/add-new-repository.png | Bin 0 -> 10026 bytes
doc/images/api-token-host.png | Bin 0 -> 25207 bytes
doc/images/repositories-panel.png | Bin 0 -> 32812 bytes
doc/install/install-api-server.html.textile.liquid | 2 +-
doc/user/reference/api-tokens.html.textile.liquid | 2 +-
doc/user/topics/arv-copy.html.textile.liquid | 80 ++++
.../add-new-repository.html.textile.liquid | 40 ++
.../tutorial-firstscript.html.textile.liquid | 5 +-
.../tutorial-submit-job.html.textile.liquid | 26 +-
sdk/go/arvadosclient/arvadosclient.go | 2 +-
sdk/go/blockdigest/blockdigest.go | 64 ++-
sdk/go/blockdigest/blockdigest_test.go | 93 +++-
sdk/go/blockdigest/testing.go | 16 +
sdk/go/logger/logger.go | 7 +-
sdk/go/logger/main/testlogger.go | 29 --
sdk/go/logger/util.go | 20 +
sdk/go/manifest/manifest.go | 47 +-
sdk/go/manifest/manifest_test.go | 76 +---
services/datamanager/collection/collection.go | 109 +++--
services/datamanager/collection/collection_test.go | 123 ++++++
services/datamanager/collection/testing.go | 60 +++
services/datamanager/datamanager.go | 95 +++-
services/datamanager/keep/keep.go | 90 ++--
services/datamanager/loggerutil/loggerutil.go | 13 +-
services/datamanager/summary/canonical_string.go | 27 ++
services/datamanager/summary/file.go | 120 ++++++
services/datamanager/summary/pull_list.go | 194 +++++++++
services/datamanager/summary/pull_list_test.go | 279 ++++++++++++
services/datamanager/summary/summary.go | 267 ++++++++++++
services/datamanager/summary/summary_test.go | 220 ++++++++++
services/fuse/arvados_fuse/__init__.py | 3 +-
services/fuse/tests/mount_test_base.py | 72 ++++
.../performance/test_collection_performance.py | 477 +++++++++++++++++++++
services/fuse/tests/test_mount.py | 72 +---
services/keepstore/handler_test.go | 3 +
services/keepstore/keepstore.go | 12 +-
services/keepstore/trash_worker.go | 13 +-
services/keepstore/trash_worker_test.go | 29 ++
42 files changed, 2470 insertions(+), 338 deletions(-)
create mode 100644 doc/_includes/_arv_copy_expectations.liquid
create mode 100644 doc/images/add-new-repository.png
create mode 100644 doc/images/api-token-host.png
create mode 100644 doc/images/repositories-panel.png
create mode 100644 doc/user/topics/arv-copy.html.textile.liquid
create mode 100644 doc/user/tutorials/add-new-repository.html.textile.liquid
create mode 100644 sdk/go/blockdigest/testing.go
delete mode 100644 sdk/go/logger/main/testlogger.go
create mode 100644 sdk/go/logger/util.go
create mode 100644 services/datamanager/collection/collection_test.go
create mode 100644 services/datamanager/collection/testing.go
create mode 100644 services/datamanager/summary/canonical_string.go
create mode 100644 services/datamanager/summary/file.go
create mode 100644 services/datamanager/summary/pull_list.go
create mode 100644 services/datamanager/summary/pull_list_test.go
create mode 100644 services/datamanager/summary/summary.go
create mode 100644 services/datamanager/summary/summary_test.go
create mode 100644 services/fuse/tests/mount_test_base.py
create mode 100644 services/fuse/tests/performance/test_collection_performance.py
discards e06a7fe89b49ad13f7a3153006be06d89f382693 (commit)
discards 949e783165d16b53f2c19c83c921e5cc8af96873 (commit)
via 0af57aeb8478b0cf0c54c99788e7c72d89d0fa5f (commit)
via 318e3d183c3800863731a20a10f1b8bf9cc82280 (commit)
via 0d9da683cb9572f6b5ba3f65376066938e701fb4 (commit)
via 66c19e11db2626bd82eb755ea6552ce5caec69af (commit)
via 1d82713672c3f6304b8f5d7d014ee39fa15bc579 (commit)
via beab0d6bf936becea2a92c6778c2008d451db0fc (commit)
via 0628f0c1d83fc71d4b0913f4f3fb90e4ad1632f2 (commit)
via 421c879e077ce8f644553ba3a1481cb55529ee33 (commit)
via 39c75ea686e2326508fd8e3d0be31cdde7906597 (commit)
via 8b8673b66d593742deb718ab5933fa2c2a1d8672 (commit)
via 8f589475096eb42dd1eccfbfbfc1fd5bc8f4e8ba (commit)
via 7adf48e3633942e40b3943db8a7a31ec23d12a5b (commit)
via d5dbaeb59cb702793b926a63cabbeaa37f96dcfd (commit)
via 66380d0e89c00559123ceda8e74e3b1487f4a95a (commit)
via 603992242f91426818fd56317c6adf4521f9500c (commit)
via 9053b511d514aa3e902259d3070ba439bfae6613 (commit)
via 5e27876fa4d3faf3b973282bfb4f152c02345bdc (commit)
via f78434fcb802949eaae131adf625950ad9981ede (commit)
via 0e57453d2b637a3d105d4e3d67031f3915f9d302 (commit)
via 5d17dfc6124a19ff7c9ebce607699d3e3f415bad (commit)
via bb8a8e8ab7dc201dccf8f2f3cf243e63ba8d14cd (commit)
via 4a5c16b70d01e063ae8fb82ee576a542b3a2376f (commit)
via 9d52ea83290cab293229815286579ab6a1584f9e (commit)
via 1d8068392d44ae35969362fb77d85e6270ff9c27 (commit)
via 9007e6691362f389e2fc282a63233562bffb8b05 (commit)
via 726cc580bb8901fb97021421cc71e3a55b37aeac (commit)
via ad2375606991dedb5cd5a574641b9cc57245539d (commit)
via ee42981c6282567f787e33523a1bcf805d7d178a (commit)
via 7e5b8ba9e260669bc6fd85c201c4f771bceaa1b0 (commit)
via 7bd12f51c864ec78fc93f0fa95acf796a4999afc (commit)
via 6196d3280c04dabf2f347a55ed5d034e6bf5aa39 (commit)
via becec5efdb1a5e031f20d30393dcccf87232118d (commit)
via 0581bd67385a585beb2d6ee5392ce7cf9d526873 (commit)
via e3ab22d08738c5aedb3e021e47959c1548f62ead (commit)
via 5b311db10a1f745d2b7018f4fd1ce462550f1bc6 (commit)
via 6e3e3c5c11a673f2347876368993da9a3715d8f3 (commit)
via ad7c6e10909fd4ac10466d62a7b3e5a77804a233 (commit)
via c74c5d27e5c79b475180e87552bafcfefb5aa9f7 (commit)
via 62f27bcb9975216848c975c20979b0837ffdb4b1 (commit)
via 67b77eb3b201786e632f0e6c6df9a9c5eb9fd402 (commit)
via fdb655af9d3ace45edc08357b3328a1f8231e449 (commit)
via 5f18d6be31b253030d884e1e3dad1cf255dd5bab (commit)
via 56753cd6748386be0cd298267486a687f22f067d (commit)
via deff6c2601a3872a141f2aa7ebdf81e0427c94cb (commit)
via 094c9628eed32ebd425382398126d337f83f3bcb (commit)
via fc69579b197cb963209111620f0a908c7811e1db (commit)
via 88393d2fb7ed29877b4a1bd2a899ffc05d7dfe9a (commit)
via 3b06308d1704a14c10f4821494085dffa8fe6ea6 (commit)
via 79be7ea20c46c6d005de5e0a24bf7b47ccfd43f6 (commit)
via 3465b6a80446e631479bb72d62739833506dc0de (commit)
via a1819526b85ce37c7d3ae421c2f5329c1c245c7f (commit)
via f5cb4310db63948ea63329415ade2ed8eef529e2 (commit)
via 46a6199f3a40a24ee145adc390500190b17a6395 (commit)
via 0dd85fcd31ef5f251dcf143fef4118d6ea56f700 (commit)
via 61c3f86eb779ab8e723e43354eddafe219bc27d9 (commit)
via 3812c3e89d4048a91db28b4b9276f0c45dba7201 (commit)
via f7cf309e7d7003b5bf9407af81e9a2b1374cde8e (commit)
via 6a59d473c1574eec4db1f83b5d1a963b4f976e5a (commit)
via 982f7db5b67194ddb3b3dd1fae594784f58b35b8 (commit)
via c63ff55687f32dfdff01b9827b411b3757d48ee7 (commit)
via 47d1bdc0960af5bfc8f2793c352f60483539c389 (commit)
via d7635fbe751b2d00dd722a038723577f344406e1 (commit)
via 5824ee2e5198dd46a7813fe2adbd380a114f9ac4 (commit)
via 999c05af58ef1bb6f2b6804301f6ef8d02544a2b (commit)
via b2329e2ce27a24a2d964743a87091413b0e5858e (commit)
via 6eb3d1fb8fe71623fa63da46c250184cf2e4fbb8 (commit)
via b9bf39b18d1e161b6b971270d15c1024ece86243 (commit)
via 5a662d84f00c0c2693c18d333bab9d0fdda7e28e (commit)
via aed4d13a2fd3a97679c512eab2b4a9e5e24df112 (commit)
via 8a0e311e4f8c402c551d61f6290e5bdca149a619 (commit)
via ef6773029872db261f1b3bf3fb2ca86f47dfdcfe (commit)
via 53f785c298338645b6880f22f26b0c36a7cfab4d (commit)
via 0191604164c265a7b972a5802680477f20451d9d (commit)
via 8e1a832244c109351a20a7181da0f65c73e63987 (commit)
via 290ddb6fb0776106cbd68a68f5753452437f357f (commit)
via b1233abce0628266a1805e52d9f9fc651c2a5c59 (commit)
via f09da35ed284ebc1ed1e941f3e3cb63b06a35d51 (commit)
via a56406d730f2a07dd442b9e99ef9dab7b7d81895 (commit)
via a5a4f79e91aa8bba1794394646808f6d4c444661 (commit)
via d3f9fad0cc83a9af47589894998a781db9c60989 (commit)
via 6b5b6890158830b26161b3879a0d1eeaa122659f (commit)
via 248d2ebb4ab7ea3d9060838bcfbfe3b9330da5ee (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (e06a7fe89b49ad13f7a3153006be06d89f382693)
\
N -- N -- N (0af57aeb8478b0cf0c54c99788e7c72d89d0fa5f)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 0af57aeb8478b0cf0c54c99788e7c72d89d0fa5f
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Jul 14 13:49:51 2015 -0400
6362: Update bootstrap gem.
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index e35cc83..9c874e2 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -53,7 +53,8 @@ group :test, :performance do
end
gem 'jquery-rails'
-gem 'bootstrap-sass', '~> 3.1.0'
+gem 'sprockets-rails'
+gem 'bootstrap-sass', '~> 3.3.0'
gem 'bootstrap-x-editable-rails'
gem 'bootstrap-tab-history-rails'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index bc7ddaf..5994359 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -51,8 +51,12 @@ GEM
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
- bootstrap-sass (3.1.1.1)
- sass (~> 3.2)
+ autoprefixer-rails (5.2.1)
+ execjs
+ json
+ bootstrap-sass (3.3.5.1)
+ autoprefixer-rails (>= 5.0.0.1)
+ sass (>= 3.3.0)
bootstrap-tab-history-rails (0.1.0)
railties (>= 3.1)
bootstrap-x-editable-rails (1.5.1.1)
@@ -256,7 +260,7 @@ DEPENDENCIES
andand
angularjs-rails
arvados (>= 0.1.20150511150219)
- bootstrap-sass (~> 3.1.0)
+ bootstrap-sass (~> 3.3.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
byebug
@@ -289,6 +293,7 @@ DEPENDENCIES
selenium-webdriver
simplecov (~> 0.7)
simplecov-rcov
+ sprockets-rails
sshkey
themes_for_rails!
therubyracer
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 9560bb7..bab7289 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -7,14 +7,15 @@
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require bootstrap
- *= require bootstrap3-editable/bootstrap-editable
- *= require morris
- *= require_tree .
*/
+ at import 'bootstrap-sprockets';
+ at import 'bootstrap';
+ at import 'bootstrap3-editable/bootstrap-editable';
+
+//= require morris
+//= require_tree .
+
.contain-align-left {
text-align: left;
}
commit 318e3d183c3800863731a20a10f1b8bf9cc82280
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Jul 14 13:49:15 2015 -0400
6362: Change config precedence order.
Before: environments/*.rb, Rails defaults, application.yml,
application.default.yml.
After: application.yml, application.default.yml, environments/*.rb,
Rails defaults.
This makes it possible to use application*.yml to control configs that
have Rails defaults. (application.default.yml file has had such
configs for ages, like assets.digest, but they have never been
effective.)
diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index 51fc81a..f14c3ca 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -23,11 +23,17 @@ ArvadosWorkbench::Application.configure do
ks.each do |kk|
cfg = cfg.send(kk)
end
- if cfg.respond_to?(k.to_sym) and !cfg.send(k).nil?
- # Config must have been set already in environments/*.rb.
+ if v.nil? and cfg.respond_to?(k) and !cfg.send(k).nil?
+ # Config is nil in *.yml, but has been set already in
+ # environments/*.rb (or has a Rails default). Don't overwrite
+ # the default/upstream config with nil.
#
# After config files have been migrated, this mechanism should
- # be deprecated, then removed.
+ # be removed.
+ Rails.logger.warn <<EOS
+DEPRECATED: Inheriting config.#{ks.join '.'} from Rails config.
+ Please move this config into config/application.yml.
+EOS
elsif v.nil?
# Config variables are not allowed to be nil. Make a "naughty"
# list, and present it below.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list