Merge branch 'master' into 1776-setup-user-email

Conflicts:
	services/api/app/controllers/arvados/v1/users_controller.rb

diff --cc apps/workbench/app/controllers/users_controller.rb
Simple merge

diff --cc services/api/Gemfile
Simple merge

diff --cc services/api/Gemfile.lock
index 460c58ea69bff934b9f30087eca1388bba3a7664,e6fcbde95a5909f32188f2eb89492d7e92d0fe35..7a516d5725c30c349797966e658e66be0925aadd
--- 1/services/api/Gemfile.lock
--- 2/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@@ -1,12 -1,12 +1,12 @@@
  GEM
    remote: https://rubygems.org/
    specs:
--    actionmailer (3.2.15)
--      actionpack (= 3.2.15)
++    actionmailer (3.2.17)
++      actionpack (= 3.2.17)
        mail (~> 2.5.4)
--    actionpack (3.2.15)
--      activemodel (= 3.2.15)
--      activesupport (= 3.2.15)
++    actionpack (3.2.17)
++      activemodel (= 3.2.17)
++      activesupport (= 3.2.17)
        builder (~> 3.0.0)
        erubis (~> 2.7.0)
        journey (~> 1.0.4)
@@@ -14,33 -14,33 +14,33 @@@
        rack-cache (~> 1.2)
        rack-test (~> 0.6.1)
        sprockets (~> 2.2.1)
--    activemodel (3.2.15)
--      activesupport (= 3.2.15)
++    activemodel (3.2.17)
++      activesupport (= 3.2.17)
        builder (~> 3.0.0)
--    activerecord (3.2.15)
--      activemodel (= 3.2.15)
--      activesupport (= 3.2.15)
++    activerecord (3.2.17)
++      activemodel (= 3.2.17)
++      activesupport (= 3.2.17)
        arel (~> 3.0.2)
        tzinfo (~> 0.3.29)
--    activeresource (3.2.15)
--      activemodel (= 3.2.15)
--      activesupport (= 3.2.15)
--    activesupport (3.2.15)
++    activeresource (3.2.17)
++      activemodel (= 3.2.17)
++      activesupport (= 3.2.17)
++    activesupport (3.2.17)
        i18n (~> 0.6, >= 0.6.4)
        multi_json (~> 1.0)
--    acts_as_api (0.4.1)
++    acts_as_api (0.4.2)
        activemodel (>= 3.0.0)
        activesupport (>= 3.0.0)
        rack (>= 1.1.0)
--    addressable (2.3.5)
++    addressable (2.3.6)
      andand (1.3.3)
--    arel (3.0.2)
-     arvados (0.1.20140328152103)
 -    arvados (0.1.20140411162938)
++    arel (3.0.3)
++    arvados (0.1.20140414145041)
        activesupport (>= 3.2.13)
        andand
        google-api-client (~> 0.6.3)
        json (>= 1.7.7)
-     arvados-cli (0.1.20140328152103)
 -    arvados-cli (0.1.20140411162938)
++    arvados-cli (0.1.20140414145041)
        activesupport (~> 3.2, >= 3.2.13)
        andand (~> 1.3, >= 1.3.3)
        arvados (~> 0.1.0)
@@@ -66,13 -66,12 +66,13 @@@
      coffee-script (2.2.0)
        coffee-script-source
        execjs
--    coffee-script-source (1.6.3)
 -    daemon_controller (1.1.7)
++    coffee-script-source (1.7.0)
 +    curb (0.8.5)
-     daemon_controller (1.1.7)
++    daemon_controller (1.2.0)
      erubis (2.7.0)
      execjs (2.0.2)
      extlib (0.9.16)
--    faraday (0.8.8)
++    faraday (0.8.9)
        multipart-post (~> 1.2.0)
      google-api-client (0.6.4)
        addressable (>= 2.3.2)
@@@ -85,16 -84,16 +85,16 @@@
        signet (~> 0.4.5)
        uuidtools (>= 2.1.0)
      hashie (1.2.0)
--    highline (1.6.20)
++    highline (1.6.21)
      hike (1.2.3)
--    httpauth (0.2.0)
--    i18n (0.6.5)
++    httpauth (0.2.1)
++    i18n (0.6.9)
      journey (1.0.4)
--    jquery-rails (3.0.4)
++    jquery-rails (3.1.0)
        railties (>= 3.0, < 5.0)
        thor (>= 0.14, < 2.0)
      json (1.8.1)
--    jwt (0.1.8)
++    jwt (0.1.11)
        multi_json (>= 1.5)
      launchy (2.4.2)
        addressable (~> 2.3)
@@@ -102,14 -101,14 +102,14 @@@
      mail (2.5.4)
        mime-types (~> 1.16)
        treetop (~> 1.4.8)
--    mime-types (1.25)
--    multi_json (1.8.2)
++    mime-types (1.25.1)
++    multi_json (1.9.2)
      multipart-post (1.2.0)
--    net-scp (1.1.2)
++    net-scp (1.2.0)
        net-ssh (>= 2.6.5)
      net-sftp (2.1.2)
        net-ssh (>= 2.6.5)
--    net-ssh (2.7.0)
++    net-ssh (2.8.0)
      net-ssh-gateway (1.2.0)
        net-ssh (>= 2.6.5)
      oauth2 (0.8.1)
@@@ -118,49 -117,49 +118,49 @@@
        jwt (~> 0.1.4)
        multi_json (~> 1.0)
        rack (~> 1.2)
--    oj (2.1.7)
++    oj (2.7.3)
      omniauth (1.1.1)
        hashie (~> 1.2)
        rack
      omniauth-oauth2 (1.1.1)
        oauth2 (~> 0.8.0)
        omniauth (~> 1.0)
--    passenger (4.0.23)
--      daemon_controller (>= 1.1.0)
++    passenger (4.0.41)
++      daemon_controller (>= 1.2.0)
        rack
        rake (>= 0.8.1)
--    pg (0.17.0)
--    polyglot (0.3.3)
++    pg (0.17.1)
++    polyglot (0.3.4)
      rack (1.4.5)
      rack-cache (1.2)
        rack (>= 0.4)
--    rack-ssl (1.3.3)
++    rack-ssl (1.3.4)
        rack
      rack-test (0.6.2)
        rack (>= 1.0)
--    rails (3.2.15)
--      actionmailer (= 3.2.15)
--      actionpack (= 3.2.15)
--      activerecord (= 3.2.15)
--      activeresource (= 3.2.15)
--      activesupport (= 3.2.15)
++    rails (3.2.17)
++      actionmailer (= 3.2.17)
++      actionpack (= 3.2.17)
++      activerecord (= 3.2.17)
++      activeresource (= 3.2.17)
++      activesupport (= 3.2.17)
        bundler (~> 1.0)
--      railties (= 3.2.15)
--    railties (3.2.15)
--      actionpack (= 3.2.15)
--      activesupport (= 3.2.15)
++      railties (= 3.2.17)
++    railties (3.2.17)
++      actionpack (= 3.2.17)
++      activesupport (= 3.2.17)
        rack-ssl (~> 1.3.2)
        rake (>= 0.8.7)
        rdoc (~> 3.4)
        thor (>= 0.14.6, < 2.0)
--    rake (10.1.0)
++    rake (10.2.2)
      rdoc (3.12.2)
        json (~> 1.4)
--    redis (3.0.5)
++    redis (3.0.7)
      ref (1.0.5)
      rvm-capistrano (1.5.1)
        capistrano (~> 2.15.4)
--    sass (3.2.12)
++    sass (3.3.4)
      sass-rails (3.2.6)
        railties (~> 3.2.0)
        sass (>= 3.1.10)
@@@ -175,21 -174,19 +175,21 @@@
        multi_json (~> 1.0)
        rack (~> 1.0)
        tilt (~> 1.1, != 1.3.0)
--    sqlite3 (1.3.8)
--    test_after_commit (0.2.2)
 -    therubyracer (0.12.0)
++    sqlite3 (1.3.9)
++    test_after_commit (0.2.3)
 +    themes_for_rails (0.5.1)
 +      rails (>= 3.0.0)
-     therubyracer (0.12.0)
++    therubyracer (0.12.1)
        libv8 (~> 3.16.14.0)
        ref
--    thor (0.18.1)
++    thor (0.19.1)
      tilt (1.4.1)
      treetop (1.4.15)
        polyglot
        polyglot (>= 0.3.1)
      trollop (2.0)
--    tzinfo (0.3.38)
--    uglifier (2.3.0)
++    tzinfo (0.3.39)
++    uglifier (2.5.0)
        execjs (>= 0.3.0)
        json (>= 1.8.0)
      uuidtools (2.1.4)

diff --cc services/api/app/controllers/application_controller.rb
Simple merge

diff --cc services/api/app/controllers/arvados/v1/users_controller.rb
index f39a8830df5d63aa76210d1530c933a4a1d88b59,de067ce015136f7a3ea6a0f7fbf400021b4d7ba1..08368cb5ef110d6181dcdd0f4f696adacba48eee
--- 1/services/api/app/controllers/arvados/v1/users_controller.rb
--- 2/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@@ -131,12 -130,7 +130,12 @@@ class Arvados::V1::UsersController < Ap
                      params[:repo_name], params[:vm_uuid]
      end
  
-     render json: { kind: "arvados#HashList", items: @response }
 +    # setup succeeded. send email to user
 +    if params[:send_notification_email] == true || params[:send_notification_email] == 'true'
 +      UserNotifier.account_is_setup(@object).deliver
 +    end
 +
+     render json: { kind: "arvados#HashList", items: @response.as_api_response(nil) }
    end
  
    # delete user agreements, vm, repository, login links; set state to inactive

diff --cc services/api/test/functional/arvados/v1/users_controller_test.rb
Simple merge