[ARVADOS] updated: f76e58645366a0cf1d33e8d681cb051e313ea713

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/projects_controller.rb | 17 ++---------------
 apps/workbench/config/application.default.yml         |  6 +++---
 services/api/config/application.default.yml           |  2 +-
 services/api/config/application.yml.example           |  3 ---
 services/api/script/rails                             |  2 +-
 services/keep/tools/traffic_test.py                   |  4 ++--
 6 files changed, 9 insertions(+), 25 deletions(-)

       via  f76e58645366a0cf1d33e8d681cb051e313ea713 (commit)
       via  2e940d5cd2a39b31dacf2aa65487ed62645abe14 (commit)
      from  2bab50e5573bec3e46585fe23e2ffb26b1b8fe55 (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 f76e58645366a0cf1d33e8d681cb051e313ea713
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 24 13:06:22 2014 -0400

    3038: address review feeback; change the config parametter values in default yml files to avoid conflicts

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 9a58b1e..3670af2 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -41,9 +41,9 @@ development:
   local_modified: <%= '-modified' if `git status -s` %>
 
   # API server configuration
-  arvados_login_base: https://localhost:3030/login
-  arvados_v1_base: https://localhost:3030/arvados/v1
-  arvados_insecure_https: true
+  arvados_login_base: ~
+  arvados_v1_base: ~
+  arvados_insecure_https: ~
 
 production:
   force_ssl: true
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 947a5a2..ec07045 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -18,7 +18,7 @@ development:
   local_modified: <%= '-modified' if `git status -s` %>
 
   # Visitors to the API server will be redirected to the workbench
-  workbench_address: https://localhost:3031/
+  workbench_address: ~
 
 production:
   force_ssl: true
diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index 40366d3..ddbd23b 100644
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -31,9 +31,6 @@ test:
   # Tests should be able to run without further configuration, but if you do
   # want to change your local test configuration, this is where to do it.
 
-  # Visitors to the API server will be redirected to the workbench.
-  workbench_address: https://workbench.local:3001/
-
 common:
   # Settings in this section will be used in all environments
   # (development, production, test) except when overridden in the
diff --git a/services/api/script/rails b/services/api/script/rails
index 04550e8..901460c 100755
--- a/services/api/script/rails
+++ b/services/api/script/rails
@@ -13,7 +13,7 @@ module Rails
     class Server < ::Rack::Server
         def default_options
             super.merge({
-                :Port => 3001,
+                :Port => 3030,
                 :environment => (ENV['RAILS_ENV'] || "development").dup,
                 :daemonize => false,
                 :debugger => false,
diff --git a/services/keep/tools/traffic_test.py b/services/keep/tools/traffic_test.py
index de97edd..26285c1 100755
--- a/services/keep/tools/traffic_test.py
+++ b/services/keep/tools/traffic_test.py
@@ -68,7 +68,7 @@ def start():
     run_test_server.run_keep()
 
 def put(files):
-    os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3001"
+    os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
     run_test_server.authorize_with('active')
     for v in ["ARVADOS_API_HOST",
               "ARVADOS_API_HOST_INSECURE",
@@ -84,7 +84,7 @@ def put(files):
         manifest_uuid = arv_cmd(ARV_PUT_PATH, c)
 
 def get(blocks):
-    os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3001"
+    os.environ["ARVADOS_API_HOST"] = "127.0.0.1:3000"
 
     run_test_server.authorize_with('active')
     for v in ["ARVADOS_API_HOST",

commit 2e940d5cd2a39b31dacf2aa65487ed62645abe14
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 24 10:21:20 2014 -0400

    3038: revert update to remove implementation that was accidentatlly pushed to this branch instead of 3836 branch!

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 2cbdcc9..323f2a1 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -127,21 +127,8 @@ class ProjectsController < ApplicationController
       if item.owner_uuid == @object.uuid
         # Object is owned by this project. Remove it from the project by
         # changing owner to the current user.
-        begin
-          item.update_attributes owner_uuid: current_user.uuid
-          @removed_uuids << item.uuid
-        rescue ArvadosApiClient::ApiErrorResponseException => e
-          if e.message.include? 'collection_owner_uuid_name_unique'
-            rename_to = item.name + ' removed from ' +
-                        (@object.name ? @object.name : @object.uuid) +
-                        ' at ' + Time.now.to_s
-            updates = {}
-            updates[:name] = rename_to
-            updates[:owner_uuid] = current_user.uuid
-            item.update_attributes updates
-            @removed_uuids << item.uuid
-          end
-        end
+        item.update_attributes owner_uuid: current_user.uuid
+        @removed_uuids << item.uuid
       end
     end
   end

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


hooks/post-receive
--