[ARVADOS] updated: 98721242a9eff3f0f21a75aaac0ce3abeb7c3391

[git at public.curoverse.com]

Summary of changes:
 ...project.rb_deferred => 20140607150616_rename_folder_to_project.rb} | 0
 services/api/db/migrate/20140714184006_empty_collection.rb            | 4 +---
 services/api/db/structure.sql                                         | 2 ++
 services/api/lib/current_api_client.rb                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename services/api/db/migrate/{20140607150616_rename_folder_to_project.rb_deferred => 20140607150616_rename_folder_to_project.rb} (100%)

       via  98721242a9eff3f0f21a75aaac0ce3abeb7c3391 (commit)
       via  249979c4f51961364f1f7412e20266b5746b14ac (commit)
      from  ab58549b6249224decdb913097f1649e993b95a7 (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 98721242a9eff3f0f21a75aaac0ce3abeb7c3391
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 30 15:37:05 2014 -0400

    3235: Fix empty collection migration: ensure anonymous_group exists in
    the database before trying to create a permission link for it.

diff --git a/services/api/db/migrate/20140714184006_empty_collection.rb b/services/api/db/migrate/20140714184006_empty_collection.rb
index deb6bf0..15fd887 100644
--- a/services/api/db/migrate/20140714184006_empty_collection.rb
+++ b/services/api/db/migrate/20140714184006_empty_collection.rb
@@ -2,9 +2,7 @@ class EmptyCollection < ActiveRecord::Migration
   include CurrentApiClient
 
   def up
-    act_as_system_user do
-      empty_collection
-    end
+    empty_collection
   end
 
   def down
diff --git a/services/api/lib/current_api_client.rb b/services/api/lib/current_api_client.rb
index b4e6bbc..7bd4752 100644
--- a/services/api/lib/current_api_client.rb
+++ b/services/api/lib/current_api_client.rb
@@ -169,7 +169,7 @@ module CurrentApiClient
           $empty_collection = Collection.
             where(uuid: empty_collection_uuid).
             first_or_create!(manifest_text: '')
-          Link.where(tail_uuid: anonymous_group_uuid,
+          Link.where(tail_uuid: anonymous_group.uuid,
                      head_uuid: empty_collection_uuid,
                      link_class: 'permission',
                      name: 'can_read').first_or_create!

commit 249979c4f51961364f1f7412e20266b5746b14ac
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jul 30 15:35:12 2014 -0400

    3235: Enable "rename folder to project" migration.

diff --git a/services/api/db/migrate/20140607150616_rename_folder_to_project.rb_deferred b/services/api/db/migrate/20140607150616_rename_folder_to_project.rb
similarity index 100%
rename from services/api/db/migrate/20140607150616_rename_folder_to_project.rb_deferred
rename to services/api/db/migrate/20140607150616_rename_folder_to_project.rb
diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 61433a6..2d0c76f 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -1967,6 +1967,8 @@ INSERT INTO schema_migrations (version) VALUES ('20140601022548');
 
 INSERT INTO schema_migrations (version) VALUES ('20140602143352');
 
+INSERT INTO schema_migrations (version) VALUES ('20140607150616');
+
 INSERT INTO schema_migrations (version) VALUES ('20140611173003');
 
 INSERT INTO schema_migrations (version) VALUES ('20140627210837');

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


hooks/post-receive
--