[ARVADOS] updated: 1.1.4-294-g1471ad4

[Git user]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |   9 +-
 apps/workbench/app/models/user.rb                  |  41 +++++
 apps/workbench/app/views/layouts/body.html.erb     |   3 +-
 apps/workbench/app/views/users/inactive.html.erb   |   5 +
 .../app/views/users/link_account.html.erb          | 108 +++++++++++++
 apps/workbench/config/routes.rb                    |   8 +-
 .../test/integration/link_account_test.rb          | 172 +++++++++++++++++++++
 doc/_config.yml                                    |   2 +
 doc/admin/migrating-providers.html.textile.liquid  |  41 +++++
 doc/user/topics/link-accounts.html.textile.liquid  |  38 +++++
 .../app/controllers/user_sessions_controller.rb    |   2 +-
 services/api/app/models/user.rb                    |   2 +-
 .../test/fixtures/api_client_authorizations.yml    |   7 +
 services/api/test/fixtures/users.yml               |  34 ++++
 .../api/test/integration/user_sessions_test.rb     |  21 ++-
 15 files changed, 484 insertions(+), 9 deletions(-)
 create mode 100644 apps/workbench/app/views/users/link_account.html.erb
 create mode 100644 apps/workbench/test/integration/link_account_test.rb
 create mode 100644 doc/admin/migrating-providers.html.textile.liquid
 create mode 100644 doc/user/topics/link-accounts.html.textile.liquid

       via  1471ad4b235e168ccee4fa351b0025b2b380d7ac (commit)
       via  7f09dd101fd16830a6e7ebd6dee0df7aa023c9e6 (commit)
       via  e2632a25d3aab230bdc44936fa42a3d27ff15d30 (commit)
       via  bef433de900fbd0287f04cd21d615a6547f2fb76 (commit)
       via  86138c185241b1a6c74dc83497293ef3e8abb6eb (commit)
       via  6237a718e292de02dc06c2885e4a96260616ce03 (commit)
       via  076055cab16b637147d80f5bbc428434dd5b2497 (commit)
       via  6e28c722b3662f6ea769487c47ec14398e805a82 (commit)
       via  4aa2e9342254971e92b5836a56728015e9cfc714 (commit)
       via  7046a30e466536a2e8c515b3d15f4f528c68ef7f (commit)
       via  95c1923ae79a29bb8b6b9b4565b90fb95dbea363 (commit)
       via  cb913fbdfdf7a17fc01e28967281e03f371a4890 (commit)
      from  3f92c7068e94ee3a8f6bbe1907f2dd369c62cd7c (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 1471ad4b235e168ccee4fa351b0025b2b380d7ac
Merge: 3f92c70 7f09dd1
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon May 21 13:54:19 2018 -0400

    Merge branch '12995-wb-merge-acct' refs #12995
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


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


hooks/post-receive
--