4533: Merge branch 'master' into 4533-remote-reset
authorTom Clegg <tom@curoverse.com>
Fri, 21 Nov 2014 14:41:34 +0000 (09:41 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 21 Nov 2014 14:41:34 +0000 (09:41 -0500)
Conflicts:
services/api/db/seeds.rb

1  2 
apps/workbench/test/integration/pipeline_instances_test.rb
services/api/app/models/database_seeds.rb

index 93d5254934baa803d5ffc2fedbe5280865e5e9f8,0000000000000000000000000000000000000000..5a6d8750f564cff6d2a53cf332a5d672b6cfec38
mode 100644,000000..100644
--- /dev/null
@@@ -1,11 -1,0 +1,12 @@@
 +class DatabaseSeeds
 +  include CurrentApiClient
 +  def self.install
 +    system_user
 +    system_group
++    all_users_group
 +    anonymous_group
 +    anonymous_user
 +    empty_collection
 +  end
 +end
 +