[ARVADOS] updated: 7eec2f46099c6bf913149a7d19c4903feb2bf835

git at public.curoverse.com git at public.curoverse.com
Tue Jan 20 03:03:16 EST 2015


Summary of changes:
 .../app/assets/javascripts/selection.js.erb        | 50 +++++++++-----
 .../app/controllers/application_controller.rb      | 49 +++++++++++++-
 .../app/controllers/projects_controller.rb         | 46 -------------
 .../app/controllers/repositories_controller.rb     | 12 ++++
 .../_show_sharing.html.erb                         | 12 ++--
 .../views/projects/_show_contents_rows.html.erb    |  2 +-
 .../app/views/projects/_show_tab_contents.html.erb | 11 +--
 apps/workbench/config/routes.rb                    |  4 +-
 .../test/controllers/projects_controller_test.rb   | 27 +++-----
 .../controllers/repositories_controller_test.rb    | 44 ++++++++++++
 apps/workbench/test/helpers/share_object_helper.rb | 78 ++++++++++++++++++++++
 apps/workbench/test/integration/projects_test.rb   | 76 ++-------------------
 .../test/integration/repositories_test.rb          | 43 ++++++++++++
 sdk/cli/bin/crunch-job                             |  2 +-
 14 files changed, 292 insertions(+), 164 deletions(-)
 rename apps/workbench/app/views/{projects => application}/_show_sharing.html.erb (88%)
 create mode 100644 apps/workbench/test/helpers/share_object_helper.rb
 create mode 100644 apps/workbench/test/integration/repositories_test.rb

  discards  9a4fa1884b45b971aaf9f614784cc374dbc6b758 (commit)
       via  7eec2f46099c6bf913149a7d19c4903feb2bf835 (commit)
       via  570a38bc06cca2a2902f7da3d0a2b63709480845 (commit)
       via  faf89f7e200e69dca019cf530e121d08ac06f105 (commit)
       via  ac8b77cf3ed0d979e7e6b73c09ce552a51aeb3e9 (commit)
       via  420a4a7230e85ef816b39e73f7192348a30181c6 (commit)
       via  204c462041de0b063ed1169c0f600f082400815f (commit)
       via  effc4bd7d29bc7af805e576391061d9d68f2db31 (commit)
       via  1ec89c1c31669eb89bd1997cfa9d3c50f0204dbe (commit)
       via  59963e1ee432a51a3f7ae3d98068a541b2738879 (commit)
       via  904e7471a5f5c00ba8e81e878e6d2371926b29e6 (commit)
       via  7ced789760c7e7b4df4fe3ddecf0611ff1fe12e5 (commit)
       via  cb833bd3216cb09a36b171d1805f3c0ad6d03d64 (commit)
       via  752b9167416a5c8b64bef4946fbc15939b4bfe75 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (9a4fa1884b45b971aaf9f614784cc374dbc6b758)
            \
             N -- N -- N (7eec2f46099c6bf913149a7d19c4903feb2bf835)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 7eec2f46099c6bf913149a7d19c4903feb2bf835
Merge: 9707b0c 570a38b
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jan 20 03:04:07 2015 -0500

    3021: Merge branch 'master' into 3021-api-performance

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list