[ARVADOS] updated: e146ad301ac42da3bf5b2d1f0f64ec2b1cd1a5c7

git at public.curoverse.com git at public.curoverse.com
Mon May 4 15:55:48 EDT 2015


Summary of changes:
 .../app/assets/stylesheets/application.css.scss    |  8 +--
 .../app/controllers/repositories_controller.rb     |  9 ---
 apps/workbench/app/helpers/application_helper.rb   |  4 +-
 apps/workbench/app/models/repository.rb            | 11 +--
 .../pipeline_instances/_running_component.html.erb |  3 +-
 .../app/views/projects/_show_description.html.erb  |  2 +-
 apps/workbench/config/application.default.yml      |  6 --
 .../controllers/repositories_controller_test.rb    |  4 --
 .../test/integration/repositories_browse_test.rb   |  2 -
 crunch_scripts/crunchutil/vwd.py                   | 81 +++++++++++++++++-----
 crunch_scripts/run-command                         | 28 +++-----
 doc/user/topics/run-command.html.textile.liquid    |  8 ++-
 sdk/python/arvados/commands/arv_copy.py            | 10 ++-
 sdk/python/arvados/keep.py                         | 18 +++--
 sdk/python/tests/keepstub.py                       |  9 +++
 sdk/python/tests/test_collections.py               |  2 +-
 .../api/app/controllers/application_controller.rb  | 37 ++++++++--
 .../arvados/v1/collections_controller.rb           |  4 ++
 .../controllers/arvados/v1/schema_controller.rb    |  1 +
 services/api/app/models/arvados_model.rb           |  7 ++
 services/api/app/models/collection.rb              |  4 +-
 services/api/config/application.default.yml        | 30 +++++++-
 .../arvados/v1/collections_controller_test.rb      | 39 +++++++++++
 services/arv-git-httpd/auth_handler.go             |  2 +-
 services/arv-git-httpd/basic_auth_test.go          | 12 ++--
 services/arv-git-httpd/server_test.go              | 18 ++++-
 26 files changed, 251 insertions(+), 108 deletions(-)

       via  e146ad301ac42da3bf5b2d1f0f64ec2b1cd1a5c7 (commit)
       via  71ebe5f5239249e9739f570260d9b6aa2d2134ac (commit)
       via  73c9a44b85ba72e881c5133422fcabe3f1322142 (commit)
       via  83164dbf6265f4d676324b2527ac558d1660663a (commit)
       via  47f4f1b26cdebb4ea9b52ac36e6d14f634531ebc (commit)
       via  ffadd5d842dc27fdc34af809c51a9982f3c4b4fa (commit)
       via  b02d96279c226836fe73f042a84e15c85bcd744a (commit)
       via  eb3303340c51d13512397c3d83c955af9f516f47 (commit)
       via  eb03fb3ad316a637f032f911af7d69950482ead3 (commit)
       via  fc16c2ebbb92d9b0e52b6435b717f26b9680c7e6 (commit)
       via  6fcd07063276bb57a751fa21bd6ab416b4092b3c (commit)
       via  33b41435dd88f58f5bc115f19e84936fef405b91 (commit)
       via  49a76facc1c9b64c0e80551942fa76bc8386c2f0 (commit)
       via  32254a99680b3dbcff053d7c99a26988e1f839eb (commit)
       via  8b689efa29d0db06e0a7c402c5d31107089bba5b (commit)
       via  5b970a6c9505527e146e73cb4756a64ecc1679cd (commit)
       via  e8f91c87ef238ddf6bd96914a196d2d90825e8ee (commit)
       via  3f51fa4899fe43c29e1bf49d7911a40eb41a55e8 (commit)
       via  0a87aad48d7fccfc4d7d56a8628370cb7370d792 (commit)
       via  f6fcf9f51d326fa0a42e9ebdd1343a6a6ef6d8e8 (commit)
       via  1281ecab8f2396739ee9232c36796e46cd551426 (commit)
       via  6fc44a67b911cead1513e6ddb517f56dd509663b (commit)
       via  bde53a1d5c1e55c42f9c38c5426b9a8a0acb8219 (commit)
       via  6083e43206e7bfca226ab706a2968899f2eddb07 (commit)
       via  11253affeb95b9e15528fce5117ff0ffc83c238d (commit)
       via  2826ad75d3ded03fae35522a5d75d45c223d27c1 (commit)
      from  13e4bacf309e86428e46385ed94e55915cdc4af2 (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 e146ad301ac42da3bf5b2d1f0f64ec2b1cd1a5c7
Merge: 71ebe5f 73c9a44
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon May 4 15:50:25 2015 -0400

    Merge branch 'master' into 5735-edit-description-box-size


commit 71ebe5f5239249e9739f570260d9b6aa2d2134ac
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon May 4 15:48:55 2015 -0400

    5735: use the inline css for description only so that any future inline css declarations are not impacted with this.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index f2d28e1..9560bb7 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -301,10 +301,10 @@ ul.nav.nav-tabs {
   display: block;
 }
 
-.editable-inline,
-.editable-inline .form-group,
-.editable-inline .form-group .editable-input,
-.editable-inline .form-group .editable-input textarea,
+.arv-description-as-subtitle .editable-inline,
+.arv-description-as-subtitle .editable-inline .form-group,
+.arv-description-as-subtitle .editable-inline .form-group .editable-input,
+.arv-description-as-subtitle .editable-inline .form-group .editable-input textarea,
 {
     width: 98%!important;
 }
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 4ee211b..2d1aca6 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -278,11 +278,11 @@ module ApplicationHelper
     edit_tiptitle = 'edit'
     edit_tiptitle = 'Warning: do not use hyphens in the repository name as they will be stripped' if (object.class.to_s == 'Repository' and attr == 'name')
 
-    edit_button = raw('<a href="#" class="btn btn-xs btn-' + (htmloptions['btnclass'] || 'default') + ' btn-nodecorate" data-toggle="x-editable tooltip" data-toggle-selector="#' + span_id + '" data-placement="top" title="' + (htmloptions[:tiptitle] || edit_tiptitle) + '"><i class="fa fa-fw fa-pencil"></i>' + (htmloptions['btntext'] || '') + '</a>')
+    edit_button = raw('<a href="#" class="btn btn-xs btn-' + (htmloptions[:btnclass] || 'default') + ' btn-nodecorate" data-toggle="x-editable tooltip" data-toggle-selector="#' + span_id + '" data-placement="top" title="' + (htmloptions[:tiptitle] || edit_tiptitle) + '"><i class="fa fa-fw fa-pencil"></i>' + (htmloptions[:btntext] || '') + '</a>')
 
     if htmloptions[:btnplacement] == :left
       edit_button + ' ' + span_tag
-    elsif htmloptions['btnplacement'] == 'top'
+    elsif htmloptions[:btnplacement] == :top
       edit_button + raw('<br/>') + span_tag
     else
       span_tag + ' ' + edit_button
diff --git a/apps/workbench/app/views/projects/_show_description.html.erb b/apps/workbench/app/views/projects/_show_description.html.erb
index 771217b..0ce2408 100644
--- a/apps/workbench/app/views/projects/_show_description.html.erb
+++ b/apps/workbench/app/views/projects/_show_description.html.erb
@@ -1,5 +1,5 @@
 <% if @object.respond_to? :description %>
   <div class="arv-description-as-subtitle">
-    <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual', 'data-mode' => 'inline', 'btntext' => 'Edit', 'btnplacement' => 'top', 'btnclass' => 'primary', 'data-rows' => 10 } %>
+    <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual', 'data-mode' => 'inline', 'data-rows' => 10, btntext: 'Edit', btnclass: 'primary', btnplacement: :top } %>
   </div>
 <% end %>

commit 47f4f1b26cdebb4ea9b52ac36e6d14f634531ebc
Merge: 13e4bac ffadd5d
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon May 4 12:28:57 2015 -0400

    Merge branch 'master' into 5735-edit-description-box-size


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list