projects / arvados.git / history
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch '15720-fed-user-list'
[arvados.git] / services / api / app / controllers / arvados / v1 / users_controller.rb
2019-11-25 Tom CleggMerge branch '15720-fed-user-list' blob | commitdiff | raw
2019-11-25 Tom Clegg15720: Merge branch 'master' into 15720-fed-user-list blob | commitdiff | raw
2019-11-19 Tom Clegg15720: Batch user update API. blob | commitdiff | raw
2019-10-22 Tom CleggMerge branch '15652-crunch-run-memory-use' blob | commitdiff | raw | diff to current
2019-10-15 Tom CleggMerge branch '15699-workbench-copy-fail' blob | commitdiff | raw | diff to current
2019-10-11 Peter AmstutzMerge branch '15424-wb2-welcome-page' refs #15424 blob | commitdiff | raw | diff to current
2019-10-11 Peter AmstutzMerge branch '15694-cwl-hang' closes #15694 blob | commitdiff | raw | diff to current
2019-10-11 Peter AmstutzMerge branch '15531-logincluster-migrate' refs #15531 blob | commitdiff | raw | diff to current
2019-10-08 Peter AmstutzMerge branch 'master' into 15531-logincluster-migrate blob | commitdiff | raw | diff to current
2019-09-23 Peter AmstutzMerge branch 'master' into 15531-logincluster-migrate blob | commitdiff | raw | diff to current
2019-09-23 Peter Amstutz15531: Adjust redirect_to_new_user to intended behavior blob | commitdiff | raw | diff to current
2019-09-13 Peter Amstutz15531: Implement merge with redirect_to_new_user=false blob | commitdiff | raw | diff to current
2019-06-04 Peter AmstutzMerge branch '15028-cwl-v1.1' refs #15028 blob | commitdiff | raw | diff to current
2019-05-15 Lucas Di PentimaMerge branch '15167-unlogged-attrs-api-docs' blob | commitdiff | raw | diff to current
2019-05-15 Tom Clegg15003: Merge branch 'master' into 15003-preprocess... blob | commitdiff | raw | diff to current
2019-05-13 Lucas Di PentimaMerge branch 'master' into 14988-wb-rails5-upgrade blob | commitdiff | raw | diff to current
2019-05-09 Peter AmstutzMerge branch '15061-fed-login' refs #15061 blob | commitdiff | raw | diff to current
2019-05-09 Peter Amstutz15061: Implement admin variant of user merge by uuid blob | commitdiff | raw | diff to current
2019-05-09 Peter Amstutz15061: API support for linking local account to remote... blob | commitdiff | raw | diff to current
2019-04-16 Fernando MonserratMerge branch '14670-new-java-sdk-docs' of git.curoverse... blob | commitdiff | raw | diff to current
2019-04-12 Peter AmstutzMerge branch 'master' into 14670-new-java-sdk-docs blob | commitdiff | raw | diff to current
2019-04-08 Lucas Di PentimaMerge branch '14873-api-rails5-upgrade' blob | commitdiff | raw | diff to current
2019-04-05 Lucas Di PentimaMerge branch 'master' into 14873-api-rails5-upgrade blob | commitdiff | raw | diff to current
2019-04-02 Lucas Di Pentima14873: Fixes nested params behavior on controller tests. blob | commitdiff | raw | diff to current
2019-03-28 Lucas Di PentimaMerge branch 'master' into 14873-api-rails5-upgrade blob | commitdiff | raw | diff to current
2019-03-22 Lucas Di Pentima14873: Replaces *_filter with *_action blob | commitdiff | raw | diff to current
2019-03-14 Peter AmstutzAdd 'sdk/java-v2/' from commit '55f103e336ca9fb8bf1720d... blob | commitdiff | raw | diff to current
2018-07-17 Peter AmstutzMerge branch 'master' into 13804-no-shutdown-wanted... blob | commitdiff | raw | diff to current
2018-07-17 Peter AmstutzMerge branch 'master' into 13822-nm-delayed-daemon blob | commitdiff | raw | diff to current
2018-05-11 Ward VandewegeMerge branch 'thehyve/fix-crunch-documentation' Fix... blob | commitdiff | raw | diff to current
2018-05-08 Tom CleggMerge branch '12626-merge-accounts' blob | commitdiff | raw | diff to current
2018-05-07 Tom Clegg12626: Merge branch 'master' into 12626-merge-accounts blob | commitdiff | raw | diff to current
2018-05-04 Tom Clegg12626: Advertise required params for users#merge in... blob | commitdiff | raw | diff to current
2018-05-04 Tom Clegg12626: Improve error message. blob | commitdiff | raw | diff to current
2018-05-04 Tom Clegg12626: Change variable dst_user -> new_user for consist... blob | commitdiff | raw | diff to current
2018-05-02 Tom Clegg12626: Check for scoped tokens. blob | commitdiff | raw | diff to current
2018-05-02 Tom Clegg12626: Add arvados/v1/users/merge API. blob | commitdiff | raw | diff to current
2018-04-26 Tom Clegg12708: Merge branch 'master' into 12708-balance-storage... blob | commitdiff | raw | diff to current
2018-04-23 Fernando MonserratMerge branch 'master' into 13369-update-ubuntu1404... blob | commitdiff | raw | diff to current
2018-04-23 Fernando Monserratrefs #13369 "Merge branch '13369-update-ubuntu1404... blob | commitdiff | raw | diff to current
2018-04-23 Fernando Monserratrefs #13369 "Merge branch '13369-update-ubuntu1404... blob | commitdiff | raw | diff to current
2018-04-20 Peter AmstutzMerge branch 'thehyve/master' LocalJumpError in arvados... blob | commitdiff | raw | diff to current
2018-04-20 Tom CleggMerge branch '13111-webdav-projects' blob | commitdiff | raw | diff to current
2018-04-20 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects blob | commitdiff | raw | diff to current
2018-04-13 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects blob | commitdiff | raw | diff to current
2018-04-05 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects blob | commitdiff | raw | diff to current
2018-03-27 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects blob | commitdiff | raw | diff to current
2018-03-26 Tom Clegg13111: Add /users virtual dir to siteFS. blob | commitdiff | raw | diff to current
2018-01-16 Lucas Di PentimaMerge branch '12479-wb-structured-vocabulary' blob | commitdiff | raw | diff to current
2018-01-13 Tom Clegg13111: Merge branch 'master' into 12308-go-fuse blob | commitdiff | raw | diff to current
2018-01-09 Peter AmstutzMerge branch '12921-run-in-single-hints' closes #12921 blob | commitdiff | raw | diff to current
2018-01-09 Fuad MuhicMerge branch 'master' of git.curoverse.com:arvados... blob | commitdiff | raw | diff to current
2018-01-09 Tom CleggMerge branch '12702-migrate-user' blob | commitdiff | raw | diff to current
2018-01-05 Tom Clegg12702: Add /arvados/v1/users/{uuid}/update_uuid API. blob | commitdiff | raw | diff to current
2017-07-05 Tom CleggMerge branch '8784-dir-listings' blob | commitdiff | raw | diff to current
2017-06-30 Tom CleggMerge branch '11807-yaml-to-json' blob | commitdiff | raw | diff to current
2017-06-30 radhikaArvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhik... blob | commitdiff | raw | diff to current
2017-06-29 Lucas Di Pentima11789: Merge branch 'master' into 11789-arvput-exclude... blob | commitdiff | raw | diff to current
2017-06-29 Tom CleggMerge branch '2411-check-copyright' blob | commitdiff | raw | diff to current
2017-06-28 Tom Clegg2411: Add copyright notices to everything. blob | commitdiff | raw | diff to current
2017-06-21 radhikaMerge branch 'master' into 11823-collection-lifecycle-doc blob | commitdiff | raw | diff to current
2017-06-20 radhikaMerge branch 'master' into 11060-all-visible-repos blob | commitdiff | raw | diff to current
2017-06-20 Lucas Di Pentima11789: Merge branch 'master' into 11789-arvput-exclude... blob | commitdiff | raw | diff to current
2017-06-20 Tom CleggMerge branch '10557-setup-cleanup' blob | commitdiff | raw | diff to current
2017-06-20 Tom Clegg10557: Tidy up users#setup controller. blob | commitdiff | raw | diff to current
2017-06-19 Tom Clegg8784: Merge branch 'master' into 8784-dir-listings blob | commitdiff | raw | diff to current
2017-06-19 radhikaMerge branch 'master' into 11060-all-visible-repos blob | commitdiff | raw | diff to current
2017-06-16 Lucas Di Pentima11557: Merge branch 'master' into 11557-acr-output... blob | commitdiff | raw | diff to current
2017-06-16 Tom CleggMerge branch '11283-available-slot-query' blob | commitdiff | raw | diff to current
2017-06-15 Tom CleggMerge branch '10557-auto-setup' blob | commitdiff | raw | diff to current
2017-06-14 Tom Clegg10557: Tidy up some user setup code. blob | commitdiff | raw | diff to current
2017-05-03 radhikaMerge branch 'master' into 10112-workflow-show blob | commitdiff | raw | diff to current
2017-05-02 Tom Clegg11308: Merge branch 'master' into 11308-python3 blob | commitdiff | raw | diff to current
2017-05-02 Lucas Di Pentima11185: Merge branch 'master' into 11185-wb-disable... blob | commitdiff | raw | diff to current
2017-05-02 Lucas Di Pentima11579: Merge branch 'master' into 11579-arvput-follow... blob | commitdiff | raw | diff to current
2017-05-01 Peter AmstutzMerge branch 'master' into origin-8019-crunchrun-log... blob | commitdiff | raw | diff to current
2017-04-28 Peter AmstutzMerge branch '11549-cwl-smarter-mounts' closes #11549 blob | commitdiff | raw | diff to current
2017-04-27 Tom CleggMerge branch '7709-api-rails4' blob | commitdiff | raw | diff to current
2017-04-26 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4 blob | commitdiff | raw | diff to current
2017-04-25 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4 blob | commitdiff | raw | diff to current
2017-04-10 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4 blob | commitdiff | raw | diff to current
2017-03-27 Tom Clegg7709: Upgrade to rails4, fix some of the compatibility... blob | commitdiff | raw | diff to current
2017-01-16 Tom CleggMerge branch 'master' into 9998-no-count-items-available blob | commitdiff | raw | diff to current
2017-01-12 Tom CleggMerge branch 'master' into 9998-unsigned_manifest blob | commitdiff | raw | diff to current
2016-12-09 Lucas Di Pentima10383: Merge branch 'master' into 10383-arv-put-increme... blob | commitdiff | raw | diff to current
2016-12-09 Lucas Di Pentima10585: Merge branch 'master' into 10587-python-cli... blob | commitdiff | raw | diff to current
2016-12-08 Tom CleggMerge branch '10467-client-disconnect' refs #10467 blob | commitdiff | raw | diff to current
2016-12-06 radhikaMerge branch 'master' into 10604-crunch2-user-guide blob | commitdiff | raw | diff to current
2016-12-06 Peter AmstutzMerge branch '10649-squeue-stderr' closes #10649 blob | commitdiff | raw | diff to current
2016-12-05 Tom Clegg8460: Merge branch 'master' into 8460-websocket-go blob | commitdiff | raw | diff to current
2016-12-02 Peter AmstutzMerge branch '10655-arvbash' closes #10655 blob | commitdiff | raw | diff to current
2016-12-02 Peter AmstutzMerge branch '10647-dev-jobs-image' closes #10647 blob | commitdiff | raw | diff to current
2016-12-01 Lucas Di PentimaMerge branch '5737-ruby231' blob | commitdiff | raw | diff to current
2016-12-01 Lucas Di Pentima5737: Merge branch 'master' into 5737-ruby231 blob | commitdiff | raw | diff to current
2016-11-29 Lucas Di Pentima5737: Merge branch 'master' into 5737-ruby231 blob | commitdiff | raw | diff to current
2016-11-28 Lucas Di Pentima5737: Fixes to remove ruby warnings when running websoc... blob | commitdiff | raw | diff to current
2016-03-11 Tom CleggAdd 'build/' from commit '555b039609a3c8700c27767c255fd... blob | commitdiff | raw | diff to current
2016-03-01 Peter AmstutzAdd 'tools/arvbox/' from commit 'd3d368758db1f4a9fa5b89... blob | commitdiff | raw | diff to current
2015-09-04 Joshua C. RandallMerge pull request #2 from wtsi-hgi/feature/arv-view blob | commitdiff | raw | diff to current
2015-05-19 mishazMerge branch 'master' into 3408-production-datamanager blob | commitdiff | raw | diff to current
next