[ARVADOS] updated: fa9fc5ab6440415542badc8bee0b144d698ec5cc

git at public.curoverse.com git at public.curoverse.com
Wed May 27 15:42:48 EDT 2015


Summary of changes:
 .../app/controllers/projects_controller.rb         | 11 +++-
 apps/workbench/app/views/layouts/body.html.erb     |  6 +++
 apps/workbench/app/views/projects/public.html.erb  | 29 +++++++++++
 apps/workbench/config/routes.rb                    |  2 +
 .../test/controllers/projects_controller_test.rb   | 32 ++++++++++++
 .../test/integration/anonymous_access_test.rb      |  5 ++
 .../test/integration/application_layout_test.rb    |  2 +
 doc/_config.yml                                    |  2 +-
 doc/index.html.liquid                              |  2 +-
 ...l-manual-prerequisites-ruby.html.textile.liquid |  3 +-
 .../getting_started/workbench.html.textile.liquid  |  2 +-
 doc/user/index.html.textile.liquid                 |  2 +-
 doc/user/reference/api-tokens.html.textile.liquid  |  2 +-
 ...nning-pipeline-command-line.html.textile.liquid |  6 +--
 doc/user/topics/tutorial-job1.html.textile.liquid  |  8 +--
 .../running-external-program.html.textile.liquid   |  8 +--
 .../tutorial-firstscript.html.textile.liquid       |  2 +-
 .../tutorial-submit-job.html.textile.liquid        |  2 +-
 docker/api/Dockerfile                              |  4 +-
 docker/api/apache2_vhost.in                        |  2 -
 docker/api/application.yml.in                      | 11 +---
 docker/api/arvados-clients.yml.in                  |  2 +-
 .../{keep_server_1.json => keep_server_0.json.in}  |  3 +-
 .../{keep_server_0.json => keep_server_1.json.in}  |  2 +-
 docker/api/omniauth.rb.in                          |  2 +-
 docker/api/setup-gitolite.sh.in                    |  4 +-
 docker/arvdock                                     | 58 ++++++++++++++++------
 docker/build_tools/Makefile                        | 11 +++-
 docker/build_tools/build.rb                        | 52 +++++++++----------
 docker/config.yml.example                          | 12 +----
 docker/doc/Dockerfile                              |  5 +-
 docker/doc/{apache2_vhost => apache2_vhost.in}     |  5 +-
 docker/sso/apache2_vhost.in                        |  2 -
 docker/workbench/Dockerfile                        |  4 +-
 docker/workbench/apache2_vhost.in                  | 13 ++++-
 docker/workbench/application.yml.in                |  6 ++-
 services/api/app/models/arvados_model.rb           | 21 ++++----
 ...50526180251_leading_space_on_full_text_index.rb | 41 +++++++++++++++
 services/api/db/structure.sql                      | 20 +++++---
 39 files changed, 280 insertions(+), 126 deletions(-)
 create mode 100644 apps/workbench/app/views/projects/public.html.erb
 rename docker/api/{keep_server_1.json => keep_server_0.json.in} (59%)
 rename docker/api/{keep_server_0.json => keep_server_1.json.in} (59%)
 rename docker/doc/{apache2_vhost => apache2_vhost.in} (62%)
 create mode 100644 services/api/db/migrate/20150526180251_leading_space_on_full_text_index.rb

       via  fa9fc5ab6440415542badc8bee0b144d698ec5cc (commit)
       via  32038d56fbfe5b635b1c53f247aea9abcca2285c (commit)
       via  c51a3888a01543d0835119574960a02fd7d35994 (commit)
       via  3101fea587bc08e0f4f00a583d1d9e2c953417c1 (commit)
       via  6fed84983e6e973eefff66a126f4bb7811c44d29 (commit)
       via  e73222a8d0c18b159ae3d8b53b54474650bdda16 (commit)
       via  d9214af111bb44deed1246ec97624b6bd8d970c5 (commit)
       via  59d68bda41fcc83c47795a19dbe1d0c180952a08 (commit)
       via  15009c109bee16bc09c9bbc11f7df0a677a0cf23 (commit)
       via  a2eb98fa68672d6966233d7864c328feb8df3939 (commit)
       via  b3e2782f72e0ca381f3f8c508227ebd7a2ef0c92 (commit)
       via  1a0ba80d44b4be962f898ee1458faea9d4a59137 (commit)
       via  71f1ccba7367ca9d000e53c0b86c0448600350f4 (commit)
       via  80d57cdcc9fcae93da2b507942815d9de6dd3351 (commit)
       via  a7d558d6c2db242a6555c7f397cb4d91618aa13c (commit)
       via  ae3bb0033a24a38489c49ffc26e5a5e8fd93c160 (commit)
      from  53b19718f974e7c9014644ce80fa36363ae0b693 (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 fa9fc5ab6440415542badc8bee0b144d698ec5cc
Merge: 53b1971 32038d5
Author: radhika <radhika at curoverse.com>
Date:   Wed May 27 15:38:59 2015 -0400

    Merge branch 'master' into 6093-refresh-docs
    
    Conflicts:
    	doc/user/tutorials/tutorial-submit-job.html.textile.liquid


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list