2872: Merge branch 'master' into 2872-folder-nav
authorTom Clegg <tom@curoverse.com>
Thu, 12 Jun 2014 03:57:37 +0000 (23:57 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 12 Jun 2014 03:57:37 +0000 (23:57 -0400)
commita959f21c8147f26362df392bc3fd3290db69de85
treeb4b2c585bf47826cc3f631d24facbd068e3762eb
parent70f1004b17fac3c772c8f938b5a72ff3a3ebc67a
parenta9beb0e51fdd2782c4aeaa1f5c2d20d6ad7dd435
2872: Merge branch 'master' into 2872-folder-nav

Conflicts:
apps/workbench/app/assets/javascripts/pipeline_instances.js
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/controllers/jobs_controller.rb
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
apps/workbench/app/views/application/_show_metadata.html.erb
apps/workbench/app/views/pipeline_instances/_show_components.html.erb
17 files changed:
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/assets/javascripts/editable.js
apps/workbench/app/assets/javascripts/pipeline_instances.js
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/controllers/groups_controller.rb
apps/workbench/app/controllers/jobs_controller.rb
apps/workbench/app/controllers/pipeline_instances_controller.rb
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/arvados_base.rb
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
apps/workbench/app/views/application/_show_advanced_metadata.html.erb
apps/workbench/app/views/collections/show.html.erb
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/config/routes.rb
apps/workbench/test/integration/users_test.rb