Merge branch 'patch-1' of https://github.com/mr-c/arvados into mr-c-patch-1
[arvados.git] / services / api / app / controllers / arvados / v1 / users_controller.rb
2020-07-17 Ward VandewegeMerge branch 'patch-1' of https://github.com/mr-c/arvad...
2020-05-20 Tom CleggMerge branch '16312-s3-signature-v4'
2020-05-14 Tom CleggMerge branch '16387-batch-update-deactivated-user'
2020-05-06 Tom Clegg16387: Allow setting is_active=false only on LoginClust...
2020-05-04 Tom Clegg16387: Allow batch update to set is_active=false for...
2020-04-21 Tom CleggMerge branch '16048-reload-config'
2020-04-13 Peter AmstutzMerge branch '16263-logincluster-user-list-fix' refs...
2020-03-31 Peter Amstutz16263: Rename no_federation -> bypass_federation
2020-03-31 Peter Amstutz16263: Add no_federation to user update
2020-03-31 Peter Amstutz16263: Generalize "local_user_list" flag to "no_federation"
2020-03-27 Peter Amstutz16263: Add local_user_list flag to bypass LoginCluster...
2020-03-26 Lucas Di PentimaMerge branch '16265-security-updates' into dependabot...
2020-03-26 Lucas Di PentimaMerge branch '16265-security-updates' into dependabot...
2020-03-26 Lucas Di PentimaMerge branch '16265-security-updates' into dependabot...
2020-03-26 Lucas Di PentimaMerge branch '16265-security-updates' into dependabot...
2020-03-26 Lucas Di PentimaMerge branch '16265-security-updates' into dependabot...
2020-03-23 Lucas Di Pentima16263: Adds nullify behavior to users's batch_update...
2020-03-19 Lucas Di Pentima16263: Assigns nil to select attributes when receiving...
2020-03-18 Peter AmstutzMerge branch '12409-cwl-v1.2' refs #12409
2020-03-17 Krzysztof MajewskiMerge pull request #1 from arvados/master
2020-03-13 Peter AmstutzMerge branch '16129-scoped-token-doc' refs #16129
2020-03-12 Tom CleggMerge branch '16217-ws-ping'
2020-03-10 Tom CleggMerge branch '15954-boot-test-cluster'
2020-03-10 Tom Clegg15954: Merge branch 'master'
2020-02-28 Tom Clegg15954: Merge branch 'master'
2020-02-27 Tom Clegg15954: Merge branch 'master'
2020-02-25 Tom Clegg15954: Allow activating user using an admin token.
2020-02-11 Tom Clegg15954: Merge branch 'master'
2020-01-24 Lucas Di Pentima15944: Merge branch 'master' into 15944-arvbox-publicde...
2020-01-21 Peter AmstutzAllow user 'setup' to succeed even if email notificatio...
2019-12-30 Tom Clegg15759: Merge branch 'master' into 15759-deploy-crunch-run
2019-12-30 Peter AmstutzMerge branch 'master' into 15572-new-install-docs
2019-12-18 Peter AmstutzMerge branch '15933-setup-uuid-param' refs #15933
2019-12-17 Peter Amstutz15933: Declare 'uuid' param on users/setup method disco...
2019-11-28 Tom CleggMerge branch '15795-sys-root-token'
2019-11-26 Lucas Di PentimaMerge branch '15849-vocab-migration-example'
2019-11-26 Peter AmstutzMerge branch '15795-sys-root-token' refs #15795
2019-11-25 Peter AmstutzMerge branch 'master' into 15803-unsetup
2019-11-25 Tom CleggMerge branch '15720-fed-user-list'
2019-11-25 Tom Clegg15720: Merge branch 'master' into 15720-fed-user-list
2019-11-19 Tom Clegg15720: Batch user update API.
2019-10-22 Tom CleggMerge branch '15652-crunch-run-memory-use'
2019-10-15 Tom CleggMerge branch '15699-workbench-copy-fail'
2019-10-11 Peter AmstutzMerge branch '15424-wb2-welcome-page' refs #15424
2019-10-11 Peter AmstutzMerge branch '15694-cwl-hang' closes #15694
2019-10-11 Peter AmstutzMerge branch '15531-logincluster-migrate' refs #15531
2019-10-08 Peter AmstutzMerge branch 'master' into 15531-logincluster-migrate
2019-09-23 Peter AmstutzMerge branch 'master' into 15531-logincluster-migrate
2019-09-23 Peter Amstutz15531: Adjust redirect_to_new_user to intended behavior
2019-09-13 Peter Amstutz15531: Implement merge with redirect_to_new_user=false
2019-06-04 Peter AmstutzMerge branch '15028-cwl-v1.1' refs #15028
2019-05-15 Lucas Di PentimaMerge branch '15167-unlogged-attrs-api-docs'
2019-05-15 Tom Clegg15003: Merge branch 'master' into 15003-preprocess...
2019-05-13 Lucas Di PentimaMerge branch 'master' into 14988-wb-rails5-upgrade
2019-05-09 Peter AmstutzMerge branch '15061-fed-login' refs #15061
2019-05-09 Peter Amstutz15061: Implement admin variant of user merge by uuid
2019-05-09 Peter Amstutz15061: API support for linking local account to remote...
2019-04-16 Fernando MonserratMerge branch '14670-new-java-sdk-docs' of git.curoverse...
2019-04-12 Peter AmstutzMerge branch 'master' into 14670-new-java-sdk-docs
2019-04-08 Lucas Di PentimaMerge branch '14873-api-rails5-upgrade'
2019-04-05 Lucas Di PentimaMerge branch 'master' into 14873-api-rails5-upgrade
2019-04-02 Lucas Di Pentima14873: Fixes nested params behavior on controller tests.
2019-03-28 Lucas Di PentimaMerge branch 'master' into 14873-api-rails5-upgrade
2019-03-22 Lucas Di Pentima14873: Replaces *_filter with *_action
2019-03-14 Peter AmstutzAdd 'sdk/java-v2/' from commit '55f103e336ca9fb8bf1720d...
2018-07-17 Peter AmstutzMerge branch 'master' into 13804-no-shutdown-wanted...
2018-07-17 Peter AmstutzMerge branch 'master' into 13822-nm-delayed-daemon
2018-05-11 Ward VandewegeMerge branch 'thehyve/fix-crunch-documentation' Fix...
2018-05-08 Tom CleggMerge branch '12626-merge-accounts'
2018-05-07 Tom Clegg12626: Merge branch 'master' into 12626-merge-accounts
2018-05-04 Tom Clegg12626: Advertise required params for users#merge in...
2018-05-04 Tom Clegg12626: Improve error message.
2018-05-04 Tom Clegg12626: Change variable dst_user -> new_user for consist...
2018-05-02 Tom Clegg12626: Check for scoped tokens.
2018-05-02 Tom Clegg12626: Add arvados/v1/users/merge API.
2018-04-26 Tom Clegg12708: Merge branch 'master' into 12708-balance-storage...
2018-04-23 Fernando MonserratMerge branch 'master' into 13369-update-ubuntu1404...
2018-04-23 Fernando Monserratrefs #13369 "Merge branch '13369-update-ubuntu1404...
2018-04-23 Fernando Monserratrefs #13369 "Merge branch '13369-update-ubuntu1404...
2018-04-20 Peter AmstutzMerge branch 'thehyve/master' LocalJumpError in arvados...
2018-04-20 Tom CleggMerge branch '13111-webdav-projects'
2018-04-20 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects
2018-04-13 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects
2018-04-05 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects
2018-03-27 Tom Clegg13111: Merge branch 'master' into 13111-webdav-projects
2018-03-26 Tom Clegg13111: Add /users virtual dir to siteFS.
2018-01-16 Lucas Di PentimaMerge branch '12479-wb-structured-vocabulary'
2018-01-13 Tom Clegg13111: Merge branch 'master' into 12308-go-fuse
2018-01-09 Peter AmstutzMerge branch '12921-run-in-single-hints' closes #12921
2018-01-09 Fuad MuhicMerge branch 'master' of git.curoverse.com:arvados...
2018-01-09 Tom CleggMerge branch '12702-migrate-user'
2018-01-05 Tom Clegg12702: Add /arvados/v1/users/{uuid}/update_uuid API.
2017-07-05 Tom CleggMerge branch '8784-dir-listings'
2017-06-30 Tom CleggMerge branch '11807-yaml-to-json'
2017-06-30 radhikaArvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhik...
2017-06-29 Lucas Di Pentima11789: Merge branch 'master' into 11789-arvput-exclude...
2017-06-29 Tom CleggMerge branch '2411-check-copyright'
2017-06-28 Tom Clegg2411: Add copyright notices to everything.
2017-06-21 radhikaMerge branch 'master' into 11823-collection-lifecycle-doc
2017-06-20 radhikaMerge branch 'master' into 11060-all-visible-repos
next