[ARVADOS] updated: acf8433929b812913208e0868599d3a507c7cf34
git at public.curoverse.com
git at public.curoverse.com
Fri May 8 10:27:14 EDT 2015
Summary of changes:
.../app/assets/javascripts/infinite_scroll.js | 8 +-
apps/workbench/app/assets/javascripts/tab_panes.js | 4 +-
.../app/controllers/projects_controller.rb | 2 +-
.../app/controllers/repositories_controller.rb | 25 ++++
apps/workbench/app/helpers/application_helper.rb | 6 +-
apps/workbench/app/models/repository.rb | 108 ++++++++++++++++
.../pipeline_instances/_running_component.html.erb | 16 +++
.../repositories/_repository_breadcrumbs.html.erb | 13 ++
.../app/views/repositories/show_blob.html.erb | 13 ++
.../app/views/repositories/show_commit.html.erb | 3 +
.../app/views/repositories/show_tree.html.erb | 40 ++++++
.../app/views/users/_add_ssh_key_popup.html.erb | 2 +-
apps/workbench/config/application.default.yml | 18 ++-
apps/workbench/config/routes.rb | 5 +
.../controllers/repositories_controller_test.rb | 63 ++++++++++
.../test/helpers/repository_stub_helper.rb | 33 +++++
.../test/integration/anonymous_access_test.rb | 15 ++-
apps/workbench/test/integration/jobs_test.rb | 2 +-
.../test/integration/repositories_browse_test.rb | 55 ++++++++
apps/workbench/test/test_helper.rb | 24 +++-
doc/api/schema/Repository.html.textile.liquid | 6 +-
doc/index.html.liquid | 19 +--
doc/install/install-api-server.html.textile.liquid | 2 +-
doc/install/install-sso.html.textile.liquid | 6 +-
.../install-workbench-app.html.textile.liquid | 2 +-
docker/api/application.yml.in | 6 +-
sdk/python/tests/nginx.conf | 31 +++++
sdk/python/tests/run_test_server.py | 140 +++++++++++++++++++--
.../controllers/arvados/v1/schema_controller.rb | 1 -
services/api/app/models/repository.rb | 39 ++++--
services/api/config/application.default.yml | 25 ++--
...5759_no_filenames_in_collection_search_index.rb | 11 ++
services/api/db/structure.sql | 10 +-
services/api/test/fixtures/groups.yml | 8 ++
services/api/test/fixtures/jobs.yml | 6 +
.../arvados/v1/repositories_controller_test.rb | 41 ++++--
services/api/test/helpers/git_test_helper.rb | 10 +-
services/api/test/unit/arvados_model_test.rb | 2 +-
services/api/test/unit/repository_test.rb | 4 +
services/arv-git-httpd/auth_handler.go | 4 +-
services/arv-git-httpd/server_test.go | 57 ++++-----
41 files changed, 766 insertions(+), 119 deletions(-)
create mode 100644 apps/workbench/app/views/repositories/_repository_breadcrumbs.html.erb
create mode 100644 apps/workbench/app/views/repositories/show_blob.html.erb
create mode 100644 apps/workbench/app/views/repositories/show_commit.html.erb
create mode 100644 apps/workbench/app/views/repositories/show_tree.html.erb
create mode 100644 apps/workbench/test/helpers/repository_stub_helper.rb
create mode 100644 apps/workbench/test/integration/repositories_browse_test.rb
create mode 100644 sdk/python/tests/nginx.conf
create mode 100644 services/api/db/migrate/20150423145759_no_filenames_in_collection_search_index.rb
via acf8433929b812913208e0868599d3a507c7cf34 (commit)
via bfee777f81cbdb447a107f47d6077994e93e4b8c (commit)
via f095b4447de612fd1cd7bee5f9121df76cd65434 (commit)
via 559fdf14486527af646dfab51f2c8b87af8e2eae (commit)
via 2b39eafad562600f7d7beb83f0f7f241a1c47bfc (commit)
via 7538d084fa8778289053f62a6fb8d3ea04868258 (commit)
via 97ca7222ef893c4914d6425479f05fe32b9df8eb (commit)
via 1765cd327b15151c113890860dd8818c6fc44962 (commit)
via 2054cdb05d79a3c45e8346661adc81062c383b16 (commit)
via d65e411a33c398c658c8ca4299f64b546511f78b (commit)
via 698b9c0ebf2f12c72718ebde13c63e904fff3332 (commit)
via e5aebef9b94456ded73ccf2ec7378e7ed2f3fb35 (commit)
via 66e68045ed5b7c4ebca49d81e58ef6f821e8bb89 (commit)
via b05e1bb447b7349d99ece17cd7876c08e2ade0ab (commit)
via 9816d2cf5f88d19e4e492c1e965874e5a5b3055c (commit)
via 983e7c81e1a185eda8f5c71ab78c4b207116edf3 (commit)
via 94b57902775c4aaa02cb7532f07415729ef353df (commit)
via 08717a74dbc29916e4466119d52863b095e271a4 (commit)
via de67953481cbedc480822f97cdfe5eb6dffcf0d3 (commit)
via e24125041ad492b45c97feffb33a037c5adda734 (commit)
via 3c36af3d62af5e4ee98aaafab80858182fb5cab8 (commit)
via 86860e7d65589bc9d93df5b514baee3fc5a5103a (commit)
via 9136a1b1314084e149f86ceec16d1482ccf5d8af (commit)
via 4f99b52f6866deaeb4b614e165b7af0cb3a6adba (commit)
via 3aaf20587881b6640cc27220ad10a23294e61851 (commit)
via 910a5f7a8b4c1286beaae0c7c8c45ec092aec28a (commit)
from e5f039f2e451790ff3838c5810a22a0749d18f6d (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 acf8433929b812913208e0868599d3a507c7cf34
Author: Radhika Chippada <radhika at curoverse.com>
Date: Fri May 8 10:25:20 2015 -0400
5720: when jqxhr readyState == 0 or status == 0, it could be that the user has navigated away from the page; hence return instead of showing error.
diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 0e398ec..282d9ed 100644
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -38,7 +38,7 @@ function maybe_load_more_content(event) {
}
$container.find(".spinner").detach();
$container.append(spinner);
- $container.attr('data-infinite-serial', serial);
+ $container.data('data-infinite-serial', serial);
if (src == $container.attr('data-infinite-content-href0')) {
// If we're loading the first page, collect filters from
@@ -69,12 +69,12 @@ function maybe_load_more_content(event) {
fail(function(jqxhr, status, error) {
var $faildiv;
var $container = this.container;
- if ($container.attr('data-infinite-serial') != JSON.stringify(this.serial)) {
+ if ($container.data('data-infinite-serial') != this.serial) {
// A newer request is already in progress.
return;
}
if (jqxhr.readyState == 0 || jqxhr.status == 0) {
- message = "Cancelled."
+ return; // User may have navigated away; skip.
} else if (jqxhr.responseJSON && jqxhr.responseJSON.errors) {
message = jqxhr.responseJSON.errors.join("; ");
} else {
@@ -89,7 +89,7 @@ function maybe_load_more_content(event) {
$container.find('div.spinner').replaceWith($faildiv);
}).
done(function(data, status, jqxhr) {
- if ($container.attr('data-infinite-serial') != this.serial) {
+ if ($container.data('data-infinite-serial') != this.serial) {
// A newer request is already in progress.
return;
}
diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js
index 0b38dbc..a92582c 100644
--- a/apps/workbench/app/assets/javascripts/tab_panes.js
+++ b/apps/workbench/app/assets/javascripts/tab_panes.js
@@ -133,7 +133,9 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) {
var $pane = this;
var errhtml;
var contentType = jqxhr.getResponseHeader('Content-Type');
- if (contentType && contentType.match(/\btext\/html\b/)) {
+ if (jqxhr.readyState == 0 || jqxhr.status == 0) {
+ return; // User may have navigated away; skip.
+ } else if (contentType && contentType.match(/\btext\/html\b/)) {
var $response = $(jqxhr.responseText);
var $wrapper = $('div#page-wrapper', $response);
if ($wrapper.length) {
commit bfee777f81cbdb447a107f47d6077994e93e4b8c
Merge: 7538d08 f095b44
Author: Radhika Chippada <radhika at curoverse.com>
Date: Thu Apr 23 14:06:39 2015 -0400
Merge branch 'master' into 5720-ajax-loading-error
commit 7538d084fa8778289053f62a6fb8d3ea04868258
Merge: e5f039f 97ca722
Author: Radhika Chippada <radhika at curoverse.com>
Date: Thu Apr 23 10:37:48 2015 -0400
Merge branch 'master' into 5720-ajax-loading-error
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list