2809: Merge branch 'master' refs #2809
authorTom Clegg <tom@curoverse.com>
Fri, 9 May 2014 18:38:39 +0000 (14:38 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 15 May 2014 18:18:08 +0000 (14:18 -0400)
commitbfa9ee952c1ae3f03fe2f9fa781a132411963030
tree4e5eac4a0602cb1d5e3a2cefb711378ff9e2cfb5
parent568d941d3fe4bc554af0bca6c1dc4d9fc66ce999
parent647c8b8c47ef521046bea7675af84b621c235e0f
2809: Merge branch 'master' refs #2809

Conflicts:
apps/workbench/Gemfile.lock
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/models/arvados_api_client.rb
apps/workbench/app/models/group.rb
apps/workbench/app/models/user.rb
apps/workbench/app/views/layouts/application.html.erb
13 files changed:
apps/workbench/Gemfile
apps/workbench/Gemfile.lock
apps/workbench/app/controllers/actions_controller.rb
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/collections_controller.rb
apps/workbench/app/models/arvados_api_client.rb
apps/workbench/app/models/arvados_base.rb
apps/workbench/app/models/arvados_resource_list.rb
apps/workbench/app/models/collection.rb
apps/workbench/app/models/group.rb
apps/workbench/app/models/user.rb
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/config/routes.rb